diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index ded314d9ba..8717739ec8 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -13,7 +13,7 @@ SUBDIRS += \
     tools \
     v8.pro \
     xml \
-    other.pro \
+    other \
     widgets \
 
 cross_compile:                              SUBDIRS -= host.pro
diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro
index 552c94d35f..037e03d9b6 100644
--- a/tests/auto/corelib/kernel/kernel.pro
+++ b/tests/auto/corelib/kernel/kernel.pro
@@ -6,6 +6,7 @@ SUBDIRS=\
     qitemmodel \
     qmath \
     qmetaobject \
+    qmetaobjectbuilder \
     qmetatype \
     qmimedata \
     qobject \
diff --git a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro
similarity index 100%
rename from tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro
rename to tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro
diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
similarity index 100%
rename from tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
rename to tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
deleted file mode 100644
index f15811940b..0000000000
--- a/tests/auto/other.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-# These tests don't nicely fit into one of the other .pro files.
-# They are testing too many Qt modules at the same time.
-
-TEMPLATE=subdirs
-SUBDIRS=\
-           other \
-           qmetaobjectbuilder