diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b0372acaf3..c2f58835a9 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -6,7 +6,7 @@ SUBDIRS += \
     network.pro \
     sql \
     xml \
-    other.pro
+    other
 
 !cross_compile:                             SUBDIRS += host.pro
 contains(QT_CONFIG, opengl):                SUBDIRS += opengl.pro
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index d5b1634307..5282e08f17 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -5,7 +5,5 @@ SUBDIRS=\
    exceptionsafety \
    qobjectrace \
    qsignalspy \
-   qtmd5 \
-   qtokenautomaton \
    selftests \
    utf8
diff --git a/tests/auto/host.pro b/tests/auto/host.pro
index ebe9d5661d..d4cb8adb90 100644
--- a/tests/auto/host.pro
+++ b/tests/auto/host.pro
@@ -1,12 +1,8 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-           compiler \
-           headersclean \
-           maketestselftest \
            moc \
            uic \
            qmake \
            rcc \
-           #atwrapper \     # QTBUG-19452: This test needs to be reworked or discarded
            #uiloader \      # QTBUG-19453: this test has hardcoded machine names etc.
 
diff --git a/tests/auto/atwrapper/.gitignore b/tests/auto/other/atwrapper/.gitignore
similarity index 100%
rename from tests/auto/atwrapper/.gitignore
rename to tests/auto/other/atwrapper/.gitignore
diff --git a/tests/auto/atwrapper/TODO b/tests/auto/other/atwrapper/TODO
similarity index 100%
rename from tests/auto/atwrapper/TODO
rename to tests/auto/other/atwrapper/TODO
diff --git a/tests/auto/atwrapper/atWrapper.cpp b/tests/auto/other/atwrapper/atWrapper.cpp
similarity index 100%
rename from tests/auto/atwrapper/atWrapper.cpp
rename to tests/auto/other/atwrapper/atWrapper.cpp
diff --git a/tests/auto/atwrapper/atWrapper.h b/tests/auto/other/atwrapper/atWrapper.h
similarity index 100%
rename from tests/auto/atwrapper/atWrapper.h
rename to tests/auto/other/atwrapper/atWrapper.h
diff --git a/tests/auto/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro
similarity index 100%
rename from tests/auto/atwrapper/atWrapper.pro
rename to tests/auto/other/atwrapper/atWrapper.pro
diff --git a/tests/auto/atwrapper/atWrapperAutotest.cpp b/tests/auto/other/atwrapper/atWrapperAutotest.cpp
similarity index 100%
rename from tests/auto/atwrapper/atWrapperAutotest.cpp
rename to tests/auto/other/atwrapper/atWrapperAutotest.cpp
diff --git a/tests/auto/atwrapper/desert.ini b/tests/auto/other/atwrapper/desert.ini
similarity index 100%
rename from tests/auto/atwrapper/desert.ini
rename to tests/auto/other/atwrapper/desert.ini
diff --git a/tests/auto/atwrapper/ephron.ini b/tests/auto/other/atwrapper/ephron.ini
similarity index 100%
rename from tests/auto/atwrapper/ephron.ini
rename to tests/auto/other/atwrapper/ephron.ini
diff --git a/tests/auto/atwrapper/gullgubben.ini b/tests/auto/other/atwrapper/gullgubben.ini
similarity index 100%
rename from tests/auto/atwrapper/gullgubben.ini
rename to tests/auto/other/atwrapper/gullgubben.ini
diff --git a/tests/auto/atwrapper/honshu.ini b/tests/auto/other/atwrapper/honshu.ini
similarity index 100%
rename from tests/auto/atwrapper/honshu.ini
rename to tests/auto/other/atwrapper/honshu.ini
diff --git a/tests/auto/atwrapper/kramer.ini b/tests/auto/other/atwrapper/kramer.ini
similarity index 100%
rename from tests/auto/atwrapper/kramer.ini
rename to tests/auto/other/atwrapper/kramer.ini
diff --git a/tests/auto/atwrapper/scruffy.ini b/tests/auto/other/atwrapper/scruffy.ini
similarity index 100%
rename from tests/auto/atwrapper/scruffy.ini
rename to tests/auto/other/atwrapper/scruffy.ini
diff --git a/tests/auto/atwrapper/spareribs.ini b/tests/auto/other/atwrapper/spareribs.ini
similarity index 100%
rename from tests/auto/atwrapper/spareribs.ini
rename to tests/auto/other/atwrapper/spareribs.ini
diff --git a/tests/auto/atwrapper/titan.ini b/tests/auto/other/atwrapper/titan.ini
similarity index 100%
rename from tests/auto/atwrapper/titan.ini
rename to tests/auto/other/atwrapper/titan.ini
diff --git a/tests/auto/baselineexample/baselineexample.pro b/tests/auto/other/baselineexample/baselineexample.pro
similarity index 77%
rename from tests/auto/baselineexample/baselineexample.pro
rename to tests/auto/other/baselineexample/baselineexample.pro
index 3d3d42e8cc..cc310aec3a 100644
--- a/tests/auto/baselineexample/baselineexample.pro
+++ b/tests/auto/other/baselineexample/baselineexample.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += testlib
+QT       += testlib widgets
 
 TARGET = tst_baselineexample
 CONFIG   += console
@@ -15,4 +15,4 @@ TEMPLATE = app
 SOURCES += tst_baselineexample.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
-include($$PWD/../../baselineserver/shared/qbaselinetest.pri)
+include($$PWD/../../../baselineserver/shared/qbaselinetest.pri)
diff --git a/tests/auto/baselineexample/tst_baselineexample.cpp b/tests/auto/other/baselineexample/tst_baselineexample.cpp
similarity index 100%
rename from tests/auto/baselineexample/tst_baselineexample.cpp
rename to tests/auto/other/baselineexample/tst_baselineexample.cpp
diff --git a/tests/auto/compiler/.gitignore b/tests/auto/other/compiler/.gitignore
similarity index 100%
rename from tests/auto/compiler/.gitignore
rename to tests/auto/other/compiler/.gitignore
diff --git a/tests/auto/compiler/baseclass.cpp b/tests/auto/other/compiler/baseclass.cpp
similarity index 100%
rename from tests/auto/compiler/baseclass.cpp
rename to tests/auto/other/compiler/baseclass.cpp
diff --git a/tests/auto/compiler/baseclass.h b/tests/auto/other/compiler/baseclass.h
similarity index 100%
rename from tests/auto/compiler/baseclass.h
rename to tests/auto/other/compiler/baseclass.h
diff --git a/tests/auto/compiler/compiler.pro b/tests/auto/other/compiler/compiler.pro
similarity index 100%
rename from tests/auto/compiler/compiler.pro
rename to tests/auto/other/compiler/compiler.pro
diff --git a/tests/auto/compiler/derivedclass.cpp b/tests/auto/other/compiler/derivedclass.cpp
similarity index 100%
rename from tests/auto/compiler/derivedclass.cpp
rename to tests/auto/other/compiler/derivedclass.cpp
diff --git a/tests/auto/compiler/derivedclass.h b/tests/auto/other/compiler/derivedclass.h
similarity index 100%
rename from tests/auto/compiler/derivedclass.h
rename to tests/auto/other/compiler/derivedclass.h
diff --git a/tests/auto/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp
similarity index 100%
rename from tests/auto/compiler/tst_compiler.cpp
rename to tests/auto/other/compiler/tst_compiler.cpp
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro
similarity index 100%
rename from tests/auto/headersclean/headersclean.pro
rename to tests/auto/other/headersclean/headersclean.pro
diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/other/headersclean/tst_headersclean.cpp
similarity index 100%
rename from tests/auto/headersclean/tst_headersclean.cpp
rename to tests/auto/other/headersclean/tst_headersclean.cpp
diff --git a/tests/auto/maketestselftest/checktest/checktest.pro b/tests/auto/other/maketestselftest/checktest/checktest.pro
similarity index 100%
rename from tests/auto/maketestselftest/checktest/checktest.pro
rename to tests/auto/other/maketestselftest/checktest/checktest.pro
diff --git a/tests/auto/maketestselftest/checktest/main.cpp b/tests/auto/other/maketestselftest/checktest/main.cpp
similarity index 100%
rename from tests/auto/maketestselftest/checktest/main.cpp
rename to tests/auto/other/maketestselftest/checktest/main.cpp
diff --git a/tests/auto/maketestselftest/features/dump_subdirs.prf b/tests/auto/other/maketestselftest/features/dump_subdirs.prf
similarity index 100%
rename from tests/auto/maketestselftest/features/dump_subdirs.prf
rename to tests/auto/other/maketestselftest/features/dump_subdirs.prf
diff --git a/tests/auto/maketestselftest/maketestselftest.pro b/tests/auto/other/maketestselftest/maketestselftest.pro
similarity index 100%
rename from tests/auto/maketestselftest/maketestselftest.pro
rename to tests/auto/other/maketestselftest/maketestselftest.pro
diff --git a/tests/auto/maketestselftest/test/test.pro b/tests/auto/other/maketestselftest/test/test.pro
similarity index 100%
rename from tests/auto/maketestselftest/test/test.pro
rename to tests/auto/other/maketestselftest/test/test.pro
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/other/maketestselftest/tst_maketestselftest.cpp
similarity index 100%
rename from tests/auto/maketestselftest/tst_maketestselftest.cpp
rename to tests/auto/other/maketestselftest/tst_maketestselftest.cpp
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
new file mode 100644
index 0000000000..30d153156c
--- /dev/null
+++ b/tests/auto/other/other.pro
@@ -0,0 +1,11 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qtmd5 \
+   qtokenautomaton \
+   baselineexample \
+
+!cross_compile: SUBDIRS += \
+   compiler \
+   headersclean \
+   maketestselftest \
+   # atwrapper \ # QTBUG-19452
diff --git a/tests/auto/qtmd5/.gitignore b/tests/auto/other/qtmd5/.gitignore
similarity index 100%
rename from tests/auto/qtmd5/.gitignore
rename to tests/auto/other/qtmd5/.gitignore
diff --git a/tests/auto/qtmd5/qtmd5.pro b/tests/auto/other/qtmd5/qtmd5.pro
similarity index 86%
rename from tests/auto/qtmd5/qtmd5.pro
rename to tests/auto/other/qtmd5/qtmd5.pro
index 0afc6b1b14..6973c9e5be 100644
--- a/tests/auto/qtmd5/qtmd5.pro
+++ b/tests/auto/other/qtmd5/qtmd5.pro
@@ -1,4 +1,4 @@
-include(../solutions.pri)
+include(../../solutions.pri)
 
 !contains(DEFINES, QT_NO_SOLUTIONS) {
     include($${SOLUTIONBASEDIR}/utils/qtmd5/src/qtmd5.pri)
diff --git a/tests/auto/qtmd5/tst_qtmd5.cpp b/tests/auto/other/qtmd5/tst_qtmd5.cpp
similarity index 100%
rename from tests/auto/qtmd5/tst_qtmd5.cpp
rename to tests/auto/other/qtmd5/tst_qtmd5.cpp
diff --git a/tests/auto/qtokenautomaton/.gitignore b/tests/auto/other/qtokenautomaton/.gitignore
similarity index 100%
rename from tests/auto/qtokenautomaton/.gitignore
rename to tests/auto/other/qtokenautomaton/.gitignore
diff --git a/tests/auto/qtokenautomaton/generateTokenizers.sh b/tests/auto/other/qtokenautomaton/generateTokenizers.sh
similarity index 100%
rename from tests/auto/qtokenautomaton/generateTokenizers.sh
rename to tests/auto/other/qtokenautomaton/generateTokenizers.sh
diff --git a/tests/auto/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
similarity index 100%
rename from tests/auto/qtokenautomaton/qtokenautomaton.pro
rename to tests/auto/other/qtokenautomaton/qtokenautomaton.pro
diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basic/basic.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/basic/basic.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.h b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basic/basic.h
rename to tests/auto/other/qtokenautomaton/tokenizers/basic/basic.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/basic/basic.xml b/tests/auto/other/qtokenautomaton/tokenizers/basic/basic.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basic/basic.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/basic/basic.xml
diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
rename to tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/basicNamespace/basicNamespace.xml
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
rename to tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml b/tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/boilerplate/boilerplate.xml
diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
rename to tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/noNamespace/noNamespace.xml
diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noToString/noToString.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noToString/noToString.h
rename to tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/noToString/noToString.xml b/tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/noToString/noToString.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/noToString/noToString.xml
diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
rename to tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.cpp
diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
rename to tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.h
diff --git a/tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml b/tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml
similarity index 100%
rename from tests/auto/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml
rename to tests/auto/other/qtokenautomaton/tokenizers/withNamespace/withNamespace.xml
diff --git a/tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp b/tests/auto/other/qtokenautomaton/tst_qtokenautomaton.cpp
similarity index 100%
rename from tests/auto/qtokenautomaton/tst_qtokenautomaton.cpp
rename to tests/auto/other/qtokenautomaton/tst_qtokenautomaton.cpp