diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 927d439b13c..dd9f31b6d7e 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -3,7 +3,6 @@ SUBDIRS=\
    corelib \
    collections \
    exceptionsafety \
-   q_func_info \
    qatomicint \
    qatomicpointer \
    qbitarray \
@@ -25,10 +24,7 @@ SUBDIRS=\
    qexplicitlyshareddatapointer \
    qfileinfo \
    qfilesystemwatcher \
-   qflags \
    qfreelist \
-   qgetputenv \
-   qglobal \
    qhash \
    qlibrary \
    qline \
@@ -38,7 +34,6 @@ SUBDIRS=\
    qmetatype \
    qmutex \
    qmutexlocker \
-   qnumeric \
    qobject \
    qobjectrace \
    qplugin \
@@ -46,7 +41,6 @@ SUBDIRS=\
    qpoint \
    qprocessenvironment \
    qqueue \
-   qrand \
    qreadlocker \
    qreadwritelock \
    qrect \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 122c834c632..bdb0231b325 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -2,4 +2,5 @@ TEMPLATE=subdirs
 SUBDIRS=\
    animation \
    codecs \
-   concurrent
+   concurrent \
+   global
diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro
new file mode 100644
index 00000000000..e9b547be681
--- /dev/null
+++ b/tests/auto/corelib/global/global.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qflags \
+    q_func_info \
+    qgetputenv \
+    qglobal \
+    qnumeric \
+    qrand
diff --git a/tests/auto/q_func_info/.gitignore b/tests/auto/corelib/global/q_func_info/.gitignore
similarity index 100%
rename from tests/auto/q_func_info/.gitignore
rename to tests/auto/corelib/global/q_func_info/.gitignore
diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/corelib/global/q_func_info/q_func_info.pro
similarity index 100%
rename from tests/auto/q_func_info/q_func_info.pro
rename to tests/auto/corelib/global/q_func_info/q_func_info.pro
diff --git a/tests/auto/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
similarity index 100%
rename from tests/auto/q_func_info/tst_q_func_info.cpp
rename to tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
diff --git a/tests/auto/qflags/.gitignore b/tests/auto/corelib/global/qflags/.gitignore
similarity index 100%
rename from tests/auto/qflags/.gitignore
rename to tests/auto/corelib/global/qflags/.gitignore
diff --git a/tests/auto/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro
similarity index 100%
rename from tests/auto/qflags/qflags.pro
rename to tests/auto/corelib/global/qflags/qflags.pro
diff --git a/tests/auto/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
similarity index 100%
rename from tests/auto/qflags/tst_qflags.cpp
rename to tests/auto/corelib/global/qflags/tst_qflags.cpp
diff --git a/tests/auto/qgetputenv/.gitignore b/tests/auto/corelib/global/qgetputenv/.gitignore
similarity index 100%
rename from tests/auto/qgetputenv/.gitignore
rename to tests/auto/corelib/global/qgetputenv/.gitignore
diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro
similarity index 100%
rename from tests/auto/qgetputenv/qgetputenv.pro
rename to tests/auto/corelib/global/qgetputenv/qgetputenv.pro
diff --git a/tests/auto/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
similarity index 100%
rename from tests/auto/qgetputenv/tst_qgetputenv.cpp
rename to tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
diff --git a/tests/auto/qglobal/.gitignore b/tests/auto/corelib/global/qglobal/.gitignore
similarity index 100%
rename from tests/auto/qglobal/.gitignore
rename to tests/auto/corelib/global/qglobal/.gitignore
diff --git a/tests/auto/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro
similarity index 100%
rename from tests/auto/qglobal/qglobal.pro
rename to tests/auto/corelib/global/qglobal/qglobal.pro
diff --git a/tests/auto/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
similarity index 100%
rename from tests/auto/qglobal/tst_qglobal.cpp
rename to tests/auto/corelib/global/qglobal/tst_qglobal.cpp
diff --git a/tests/auto/qnumeric/.gitignore b/tests/auto/corelib/global/qnumeric/.gitignore
similarity index 100%
rename from tests/auto/qnumeric/.gitignore
rename to tests/auto/corelib/global/qnumeric/.gitignore
diff --git a/tests/auto/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro
similarity index 100%
rename from tests/auto/qnumeric/qnumeric.pro
rename to tests/auto/corelib/global/qnumeric/qnumeric.pro
diff --git a/tests/auto/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
similarity index 100%
rename from tests/auto/qnumeric/tst_qnumeric.cpp
rename to tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
diff --git a/tests/auto/qrand/.gitignore b/tests/auto/corelib/global/qrand/.gitignore
similarity index 100%
rename from tests/auto/qrand/.gitignore
rename to tests/auto/corelib/global/qrand/.gitignore
diff --git a/tests/auto/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro
similarity index 100%
rename from tests/auto/qrand/qrand.pro
rename to tests/auto/corelib/global/qrand/qrand.pro
diff --git a/tests/auto/qrand/tst_qrand.cpp b/tests/auto/corelib/global/qrand/tst_qrand.cpp
similarity index 100%
rename from tests/auto/qrand/tst_qrand.cpp
rename to tests/auto/corelib/global/qrand/tst_qrand.cpp