diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ba795480be..34286b15bd 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,6 +2,9 @@
 add_subdirectory(scribe)
 set_target_properties(scribe PROPERTIES FOLDER "Tools")
 
+add_subdirectory(auto-tester)
+set_target_properties(auto-tester PROPERTIES FOLDER "Tools")
+
 if (BUILD_TOOLS)
   add_subdirectory(udt-test)
   set_target_properties(udt-test PROPERTIES FOLDER "Tools")
@@ -23,7 +26,4 @@ if (BUILD_TOOLS)
 
   add_subdirectory(oven)
   set_target_properties(oven PROPERTIES FOLDER "Tools")
-
-  add_subdirectory(auto-tester)
-  set_target_properties(auto-tester PROPERTIES FOLDER "Tools")
 endif()
diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index b081c8b9f1..4b6d9aad19 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.9)
+set(TARGET_NAME auto-tester)
 
-project (auto-tester)
-
-add_executable(auto-tester src/main.cpp)
\ No newline at end of file
+setup_hifi_project(Core Widgets)
diff --git a/tools/auto-tester/src/autoTester.h b/tools/auto-tester/src/autoTester.h
index 9c1ebfd53c..edb6eb1771 100644
--- a/tools/auto-tester/src/autoTester.h
+++ b/tools/auto-tester/src/autoTester.h
@@ -12,7 +12,7 @@
 #ifndef hifi_AutoTester_h
 #define hifi_AutoTester_h
 
-////#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMainWindow>
 ////#include "ui_autoTester.h"
 ////#include "Test.h"
 ////
diff --git a/tools/auto-tester/src/main.cpp b/tools/auto-tester/src/main.cpp
index 9bc9892835..774ae0a99a 100644
--- a/tools/auto-tester/src/main.cpp
+++ b/tools/auto-tester/src/main.cpp
@@ -12,7 +12,7 @@
 
 int main(int argc, char *argv[])
 {
-////    QApplication application(argc, argv);
+    QApplication application(argc, argv);
 
 ////    AutoTester autoTester;
 ////    autoTester.show();