diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 4f684869f44..2a954e79770 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -6,7 +6,6 @@
 TEMPLATE=subdirs
 SUBDIRS=\
     gui \
-    qopengl \
     qtransformedscreen \
     qwindowsurface \
     qwsembedwidget \
diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro
index d54198467db..48fa2772f90 100644
--- a/tests/auto/gui/gui.pro
+++ b/tests/auto/gui/gui.pro
@@ -4,6 +4,6 @@ SUBDIRS=\
     kernel \
     math3d \
     painting \
+    qopengl \
     text \
     util \
-
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 16bda686298..e4734638283 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -4,13 +4,14 @@ SUBDIRS=\
    qdrag \
    qevent \
    qfileopenevent \
-   qinputpanel \
    qguimetatype \
    qguivariant \
+   qinputpanel \
    qkeysequence \
    qmouseevent \
    qmouseevent_modal \
    qpalette \
+   qscreen \
    qshortcut \
    qtouchevent \
-
+   qwindow \
diff --git a/tests/auto/qscreen/qscreen.pro b/tests/auto/gui/kernel/qscreen/qscreen.pro
similarity index 71%
rename from tests/auto/qscreen/qscreen.pro
rename to tests/auto/gui/kernel/qscreen/qscreen.pro
index be3a89867dc..4ed8eefa1af 100644
--- a/tests/auto/qscreen/qscreen.pro
+++ b/tests/auto/gui/kernel/qscreen/qscreen.pro
@@ -5,3 +5,4 @@ QT += core-private gui-private testlib
 
 SOURCES  += tst_qscreen.cpp
 
+CONFIG += insignificant_test # QTBUG-22554
diff --git a/tests/auto/qscreen/tst_qscreen.cpp b/tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
similarity index 100%
rename from tests/auto/qscreen/tst_qscreen.cpp
rename to tests/auto/gui/kernel/qscreen/tst_qscreen.cpp
diff --git a/tests/auto/qwindow/qwindow.pro b/tests/auto/gui/kernel/qwindow/qwindow.pro
similarity index 100%
rename from tests/auto/qwindow/qwindow.pro
rename to tests/auto/gui/kernel/qwindow/qwindow.pro
diff --git a/tests/auto/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
similarity index 100%
rename from tests/auto/qwindow/tst_qwindow.cpp
rename to tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
diff --git a/tests/auto/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
similarity index 100%
rename from tests/auto/qopengl/qopengl.pro
rename to tests/auto/gui/qopengl/qopengl.pro
diff --git a/tests/auto/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
similarity index 100%
rename from tests/auto/qopengl/tst_qopengl.cpp
rename to tests/auto/gui/qopengl/tst_qopengl.cpp
diff --git a/tests/auto/opengl/opengl.pro b/tests/auto/opengl/opengl.pro
index 6c8e4ca96b1..963cda170d3 100644
--- a/tests/auto/opengl/opengl.pro
+++ b/tests/auto/opengl/opengl.pro
@@ -1,7 +1,6 @@
 TEMPLATE=subdirs
 SUBDIRS=\
     qgl \
-    qglthreads \
     qglbuffer \
     qglfunctions \
-
+    qglthreads \