diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index 531073479e..c990ff1d18 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -10,6 +10,9 @@ link_hifi_libraries()
 
 set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
 
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+
 # Find all sources files
 file (GLOB_RECURSE SOURCES src/*.cpp)
 file (GLOB_RECURSE MOC_HEADERS src/*.h)
diff --git a/tools/auto-tester/src/Test.cpp b/tools/auto-tester/src/Test.cpp
index 978f1a1adc..e5614bc908 100644
--- a/tools/auto-tester/src/Test.cpp
+++ b/tools/auto-tester/src/Test.cpp
@@ -30,7 +30,7 @@
 #include "Test.h"
 
 #include <assert.h>
-#include <QTextStream>
+#include <QtCore/QTextStream>
 
 Test::Test() {
     snapshotFilenameFormat = QRegularExpression("hifi-snap-by-.+-on-\\d\\d\\d\\d-\\d\\d-\\d\\d_\\d\\d-\\d\\d-\\d\\d.jpg");
diff --git a/tools/auto-tester/src/Test.h b/tools/auto-tester/src/Test.h
index fb34e472ca..bbebe340d4 100644
--- a/tools/auto-tester/src/Test.h
+++ b/tools/auto-tester/src/Test.h
@@ -12,9 +12,9 @@
 #ifndef hifi_test_h
 #define hifi_test_h
 
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QRegularExpression>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QRegularExpression>
 
 #include "ui/MismatchWindow.h"
 
diff --git a/tools/auto-tester/src/common.h b/tools/auto-tester/src/common.h
index cb2a023c37..1f66466009 100644
--- a/tools/auto-tester/src/common.h
+++ b/tools/auto-tester/src/common.h
@@ -10,7 +10,7 @@
 #ifndef hifi_common_h
 #define hifi_common_h
 
-#include <QString>
+#include <QtCore/QString>
 
 class TestFailure {
 public:
diff --git a/tools/auto-tester/src/ui/MismatchWindow.cpp b/tools/auto-tester/src/ui/MismatchWindow.cpp
index 43cf1c2c30..fa1598aad6 100644
--- a/tools/auto-tester/src/ui/MismatchWindow.cpp
+++ b/tools/auto-tester/src/ui/MismatchWindow.cpp
@@ -9,7 +9,7 @@
 //
 #include "MismatchWindow.h"
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 MismatchWindow::MismatchWindow(QWidget *parent)
     : QDialog(parent)