diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build
index 213ea3d61c1..d97889ef2e5 100644
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -6,12 +6,8 @@
 
 UNIFIED_SOURCES += [
     'TestArray.cpp',
-    'TestCRT.cpp',
-    'TestEncoding.cpp',
-    'TestExpirationTracker.cpp',
     'TestFileUtils.cpp',
     'TestGCPostBarriers.cpp',
-    'TestStrings.cpp',
 ]
 
 LOCAL_INCLUDES = [
diff --git a/xpcom/glue/tests/gtest/TestCRT.cpp b/xpcom/tests/gtest/TestCRT.cpp
similarity index 100%
rename from xpcom/glue/tests/gtest/TestCRT.cpp
rename to xpcom/tests/gtest/TestCRT.cpp
diff --git a/xpcom/glue/tests/gtest/TestEncoding.cpp b/xpcom/tests/gtest/TestEncoding.cpp
similarity index 100%
rename from xpcom/glue/tests/gtest/TestEncoding.cpp
rename to xpcom/tests/gtest/TestEncoding.cpp
diff --git a/xpcom/glue/tests/gtest/TestExpirationTracker.cpp b/xpcom/tests/gtest/TestExpirationTracker.cpp
similarity index 100%
rename from xpcom/glue/tests/gtest/TestExpirationTracker.cpp
rename to xpcom/tests/gtest/TestExpirationTracker.cpp
diff --git a/xpcom/glue/tests/gtest/TestStrings.cpp b/xpcom/tests/gtest/TestStrings.cpp
similarity index 100%
rename from xpcom/glue/tests/gtest/TestStrings.cpp
rename to xpcom/tests/gtest/TestStrings.cpp
diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build
index 7c97148fdc7..50fffc04289 100644
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -5,7 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
+    'TestCRT.cpp',
+    'TestEncoding.cpp',
+    'TestExpirationTracker.cpp',
     'TestSnappyStreams.cpp',
+    'TestStrings.cpp',
 ]
 
 FINAL_LIBRARY = 'xul-gtest'