diff --git a/tests/shared/src/AngularConstraintTests.cpp b/tests/shared/src/AngularConstraintTests.cpp
index 95c5db18c2..4dcf3d7296 100644
--- a/tests/shared/src/AngularConstraintTests.cpp
+++ b/tests/shared/src/AngularConstraintTests.cpp
@@ -16,6 +16,7 @@
 #include <StreamUtils.h>
 
 #include "AngularConstraintTests.h"
+#include "../QTestExtensions.h"
 
 // Computes the error value between two quaternions (using glm::dot)
 float getErrorDifference(const glm::quat& a, const glm::quat& b) {
diff --git a/tests/shared/src/AngularConstraintTests.h b/tests/shared/src/AngularConstraintTests.h
index df2fe8e9c3..705639b571 100644
--- a/tests/shared/src/AngularConstraintTests.h
+++ b/tests/shared/src/AngularConstraintTests.h
@@ -12,6 +12,7 @@
 #ifndef hifi_AngularConstraintTests_h
 #define hifi_AngularConstraintTests_h
 
+#include <glm/glm.hpp>
 #include <QtTest/QtTest>
 
 class AngularConstraintTests : public QObject {
@@ -21,10 +22,6 @@ private slots:
     void testConeRollerConstraint();
 };
 
-// Use QCOMPARE_WITH_ABS_ERROR and define it for glm::quat
-#include <glm/glm.hpp>
-float getErrorDifference (const glm::quat& a, const glm::quat& b);
-QTextStream & operator << (QTextStream& stream, const glm::quat& q);
-#include "../QTestExtensions.h"
+float getErrorDifference(const glm::quat& a, const glm::quat& b);
 
 #endif // hifi_AngularConstraintTests_h
diff --git a/tests/shared/src/MovingPercentileTests.cpp b/tests/shared/src/MovingPercentileTests.cpp
index b9593fca83..fbbc3c7b9e 100644
--- a/tests/shared/src/MovingPercentileTests.cpp
+++ b/tests/shared/src/MovingPercentileTests.cpp
@@ -16,6 +16,7 @@
 
 #include <limits>
 #include <qqueue.h>
+#include <../QTestExtensions.h>
 
 QTEST_MAIN(MovingPercentileTests)
 
diff --git a/tests/shared/src/MovingPercentileTests.h b/tests/shared/src/MovingPercentileTests.h
index 4a1d4b33d2..ffc8ddb0f6 100644
--- a/tests/shared/src/MovingPercentileTests.h
+++ b/tests/shared/src/MovingPercentileTests.h
@@ -13,7 +13,6 @@
 #define hifi_MovingPercentileTests_h
 
 #include <QtTest/QtTest>
-#include <../QTestExtensions.h>
 
 class MovingPercentileTests : public QObject {
     Q_OBJECT
diff --git a/tests/shared/src/TransformTests.cpp b/tests/shared/src/TransformTests.cpp
index 93b0583aa6..be22914b9d 100644
--- a/tests/shared/src/TransformTests.cpp
+++ b/tests/shared/src/TransformTests.cpp
@@ -8,10 +8,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include "TransformTests.h"
+
 #include <Transform.h>
 
-#include "TransformTests.h"
 #include "SharedLogging.h"
+#include <../QTestExtensions.h>
 
 using namespace glm;
 
diff --git a/tests/shared/src/TransformTests.h b/tests/shared/src/TransformTests.h
index ab5c8cf144..a4d9b2a6c0 100644
--- a/tests/shared/src/TransformTests.h
+++ b/tests/shared/src/TransformTests.h
@@ -40,8 +40,6 @@ inline QTextStream& operator<< (QTextStream& stream, const glm::mat4& matrix) {
     return stream;
 }
 
-#include <../QTestExtensions.h>
-
 class TransformTests : public QObject {
     Q_OBJECT
 private slots: