diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 655a971193..f3b78c6e85 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -40,7 +40,6 @@ SUBDIRS=\
    qsignalspy \
    qsize \
    qsizef \
-   qstate \
    qstl \
    qstring \
    qstringbuilder1 \
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 0d19a2cb04..03a7035af0 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -6,4 +6,5 @@ SUBDIRS=\
    global \
    io \
    kernel \
-   plugin
+   plugin \
+   statemachine
diff --git a/tests/auto/qstate/qstate.pro b/tests/auto/corelib/statemachine/qstate/qstate.pro
similarity index 100%
rename from tests/auto/qstate/qstate.pro
rename to tests/auto/corelib/statemachine/qstate/qstate.pro
diff --git a/tests/auto/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
similarity index 100%
rename from tests/auto/qstate/tst_qstate.cpp
rename to tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
similarity index 100%
rename from tests/auto/qstatemachine/qstatemachine.pro
rename to tests/auto/corelib/statemachine/qstatemachine/qstatemachine.pro
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
similarity index 100%
rename from tests/auto/qstatemachine/tst_qstatemachine.cpp
rename to tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
diff --git a/tests/auto/corelib/statemachine/statemachine.pro b/tests/auto/corelib/statemachine/statemachine.pro
new file mode 100644
index 0000000000..aa645ac9f4
--- /dev/null
+++ b/tests/auto/corelib/statemachine/statemachine.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qstate \
+    qstatemachine
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index bb23fa234a..047f30fd38 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -111,7 +111,6 @@ SUBDIRS=\
     qstackedwidget \
     qstandarditem \
     qstandarditemmodel \
-    qstatemachine \
     qstatusbar \
     qstringlistmodel \
     qstyle \