diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 8da834d111c..655a971193a 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -19,15 +19,12 @@ SUBDIRS=\
    qexplicitlyshareddatapointer \
    qfreelist \
    qhash \
-   qlibrary \
    qline \
    qmap \
    qmargins \
    qmutex \
    qmutexlocker \
    qobjectrace \
-   qplugin \
-   qpluginloader \
    qpoint \
    qqueue \
    qreadlocker \
@@ -61,7 +58,6 @@ SUBDIRS=\
    qtimeline \
    qtmd5 \
    qtokenautomaton \
-   quuid \
    qvarlengtharray \
    qvector \
    qwaitcondition \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 5764ccc3e1f..0d19a2cb047 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -5,4 +5,5 @@ SUBDIRS=\
    concurrent \
    global \
    io \
-   kernel
+   kernel \
+   plugin
diff --git a/tests/auto/corelib/plugin/plugin.pro b/tests/auto/corelib/plugin/plugin.pro
new file mode 100644
index 00000000000..24de36e4ecc
--- /dev/null
+++ b/tests/auto/corelib/plugin/plugin.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qlibrary \
+    qplugin \
+    qpluginloader \
+    quuid
diff --git a/tests/auto/qlibrary/.gitignore b/tests/auto/corelib/plugin/qlibrary/.gitignore
similarity index 100%
rename from tests/auto/qlibrary/.gitignore
rename to tests/auto/corelib/plugin/qlibrary/.gitignore
diff --git a/tests/auto/qlibrary/lib/lib.pro b/tests/auto/corelib/plugin/qlibrary/lib/lib.pro
similarity index 100%
rename from tests/auto/qlibrary/lib/lib.pro
rename to tests/auto/corelib/plugin/qlibrary/lib/lib.pro
diff --git a/tests/auto/qlibrary/lib/mylib.c b/tests/auto/corelib/plugin/qlibrary/lib/mylib.c
similarity index 100%
rename from tests/auto/qlibrary/lib/mylib.c
rename to tests/auto/corelib/plugin/qlibrary/lib/mylib.c
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
similarity index 100%
rename from tests/auto/qlibrary/lib2/lib2.pro
rename to tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
diff --git a/tests/auto/qlibrary/lib2/mylib.c b/tests/auto/corelib/plugin/qlibrary/lib2/mylib.c
similarity index 100%
rename from tests/auto/qlibrary/lib2/mylib.c
rename to tests/auto/corelib/plugin/qlibrary/lib2/mylib.c
diff --git a/tests/auto/qlibrary/library_path/invalid.so b/tests/auto/corelib/plugin/qlibrary/library_path/invalid.so
similarity index 100%
rename from tests/auto/qlibrary/library_path/invalid.so
rename to tests/auto/corelib/plugin/qlibrary/library_path/invalid.so
diff --git a/tests/auto/qlibrary/qlibrary.pro b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro
similarity index 100%
rename from tests/auto/qlibrary/qlibrary.pro
rename to tests/auto/corelib/plugin/qlibrary/qlibrary.pro
diff --git a/tests/auto/qlibrary/tst/tst.pro b/tests/auto/corelib/plugin/qlibrary/tst/tst.pro
similarity index 100%
rename from tests/auto/qlibrary/tst/tst.pro
rename to tests/auto/corelib/plugin/qlibrary/tst/tst.pro
diff --git a/tests/auto/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
similarity index 100%
rename from tests/auto/qlibrary/tst_qlibrary.cpp
rename to tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
diff --git a/tests/auto/qplugin/.gitignore b/tests/auto/corelib/plugin/qplugin/.gitignore
similarity index 100%
rename from tests/auto/qplugin/.gitignore
rename to tests/auto/corelib/plugin/qplugin/.gitignore
diff --git a/tests/auto/qplugin/debugplugin/debugplugin.pro b/tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
similarity index 100%
rename from tests/auto/qplugin/debugplugin/debugplugin.pro
rename to tests/auto/corelib/plugin/qplugin/debugplugin/debugplugin.pro
diff --git a/tests/auto/qplugin/debugplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
similarity index 100%
rename from tests/auto/qplugin/debugplugin/main.cpp
rename to tests/auto/corelib/plugin/qplugin/debugplugin/main.cpp
diff --git a/tests/auto/qplugin/qplugin.pro b/tests/auto/corelib/plugin/qplugin/qplugin.pro
similarity index 100%
rename from tests/auto/qplugin/qplugin.pro
rename to tests/auto/corelib/plugin/qplugin/qplugin.pro
diff --git a/tests/auto/qplugin/releaseplugin/main.cpp b/tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
similarity index 100%
rename from tests/auto/qplugin/releaseplugin/main.cpp
rename to tests/auto/corelib/plugin/qplugin/releaseplugin/main.cpp
diff --git a/tests/auto/qplugin/releaseplugin/releaseplugin.pro b/tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
similarity index 100%
rename from tests/auto/qplugin/releaseplugin/releaseplugin.pro
rename to tests/auto/corelib/plugin/qplugin/releaseplugin/releaseplugin.pro
diff --git a/tests/auto/qplugin/tst_qplugin.cpp b/tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
similarity index 100%
rename from tests/auto/qplugin/tst_qplugin.cpp
rename to tests/auto/corelib/plugin/qplugin/tst_qplugin.cpp
diff --git a/tests/auto/qplugin/tst_qplugin.pro b/tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
similarity index 100%
rename from tests/auto/qplugin/tst_qplugin.pro
rename to tests/auto/corelib/plugin/qplugin/tst_qplugin.pro
diff --git a/tests/auto/qpluginloader/.gitignore b/tests/auto/corelib/plugin/qpluginloader/.gitignore
similarity index 100%
rename from tests/auto/qpluginloader/.gitignore
rename to tests/auto/corelib/plugin/qpluginloader/.gitignore
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp
similarity index 100%
rename from tests/auto/qpluginloader/almostplugin/almostplugin.cpp
rename to tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.cpp
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.h b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h
similarity index 100%
rename from tests/auto/qpluginloader/almostplugin/almostplugin.h
rename to tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.h
diff --git a/tests/auto/qpluginloader/almostplugin/almostplugin.pro b/tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
similarity index 100%
rename from tests/auto/qpluginloader/almostplugin/almostplugin.pro
rename to tests/auto/corelib/plugin/qpluginloader/almostplugin/almostplugin.pro
diff --git a/tests/auto/qpluginloader/elftest/.gitattributes b/tests/auto/corelib/plugin/qpluginloader/elftest/.gitattributes
similarity index 100%
rename from tests/auto/qpluginloader/elftest/.gitattributes
rename to tests/auto/corelib/plugin/qpluginloader/elftest/.gitattributes
diff --git a/tests/auto/qpluginloader/elftest/corrupt1.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt1.elf64.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/corrupt1.elf64.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/corrupt1.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt2.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/corrupt2.elf64.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/corrupt3.elf64.so b/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/corrupt3.elf64.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so
diff --git a/tests/auto/qpluginloader/elftest/debugobj.so b/tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/debugobj.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/debugobj.so
diff --git a/tests/auto/qpluginloader/elftest/garbage1.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage1.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/garbage1.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/garbage1.so
diff --git a/tests/auto/qpluginloader/elftest/garbage2.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage2.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/garbage2.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/garbage2.so
diff --git a/tests/auto/qpluginloader/elftest/garbage3.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage3.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/garbage3.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/garbage3.so
diff --git a/tests/auto/qpluginloader/elftest/garbage4.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage4.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/garbage4.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/garbage4.so
diff --git a/tests/auto/qpluginloader/elftest/garbage5.so b/tests/auto/corelib/plugin/qpluginloader/elftest/garbage5.so
similarity index 100%
rename from tests/auto/qpluginloader/elftest/garbage5.so
rename to tests/auto/corelib/plugin/qpluginloader/elftest/garbage5.so
diff --git a/tests/auto/qpluginloader/lib/lib.pro b/tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
similarity index 100%
rename from tests/auto/qpluginloader/lib/lib.pro
rename to tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
diff --git a/tests/auto/qpluginloader/lib/mylib.c b/tests/auto/corelib/plugin/qpluginloader/lib/mylib.c
similarity index 100%
rename from tests/auto/qpluginloader/lib/mylib.c
rename to tests/auto/corelib/plugin/qpluginloader/lib/mylib.c
diff --git a/tests/auto/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
similarity index 100%
rename from tests/auto/qpluginloader/qpluginloader.pro
rename to tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
diff --git a/tests/auto/qpluginloader/theplugin/plugininterface.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h
similarity index 100%
rename from tests/auto/qpluginloader/theplugin/plugininterface.h
rename to tests/auto/corelib/plugin/qpluginloader/theplugin/plugininterface.h
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.cpp b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp
similarity index 100%
rename from tests/auto/qpluginloader/theplugin/theplugin.cpp
rename to tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.cpp
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.h b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
similarity index 100%
rename from tests/auto/qpluginloader/theplugin/theplugin.h
rename to tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.h
diff --git a/tests/auto/qpluginloader/theplugin/theplugin.pro b/tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
similarity index 100%
rename from tests/auto/qpluginloader/theplugin/theplugin.pro
rename to tests/auto/corelib/plugin/qpluginloader/theplugin/theplugin.pro
diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
similarity index 100%
rename from tests/auto/qpluginloader/tst/tst.pro
rename to tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
similarity index 100%
rename from tests/auto/qpluginloader/tst_qpluginloader.cpp
rename to tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
diff --git a/tests/auto/quuid/.gitignore b/tests/auto/corelib/plugin/quuid/.gitignore
similarity index 100%
rename from tests/auto/quuid/.gitignore
rename to tests/auto/corelib/plugin/quuid/.gitignore
diff --git a/tests/auto/quuid/quuid.pro b/tests/auto/corelib/plugin/quuid/quuid.pro
similarity index 100%
rename from tests/auto/quuid/quuid.pro
rename to tests/auto/corelib/plugin/quuid/quuid.pro
diff --git a/tests/auto/quuid/test/test.pro b/tests/auto/corelib/plugin/quuid/test/test.pro
similarity index 100%
rename from tests/auto/quuid/test/test.pro
rename to tests/auto/corelib/plugin/quuid/test/test.pro
diff --git a/tests/auto/quuid/testProcessUniqueness/main.cpp b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
similarity index 100%
rename from tests/auto/quuid/testProcessUniqueness/main.cpp
rename to tests/auto/corelib/plugin/quuid/testProcessUniqueness/main.cpp
diff --git a/tests/auto/quuid/testProcessUniqueness/testProcessUniqueness.pro b/tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
similarity index 100%
rename from tests/auto/quuid/testProcessUniqueness/testProcessUniqueness.pro
rename to tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness.pro
diff --git a/tests/auto/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
similarity index 100%
rename from tests/auto/quuid/tst_quuid.cpp
rename to tests/auto/corelib/plugin/quuid/tst_quuid.cpp