diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c2f58835a9b..c16f00ff8b5 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -9,6 +9,6 @@ SUBDIRS += \
     other
 
 !cross_compile:                             SUBDIRS += host.pro
-contains(QT_CONFIG, opengl):                SUBDIRS += opengl.pro
+contains(QT_CONFIG, opengl):                SUBDIRS += opengl
 unix:!embedded:contains(QT_CONFIG, dbus):   SUBDIRS += dbus
 contains(QT_CONFIG, v8):                    SUBDIRS += v8.pro
diff --git a/tests/auto/opengl.pro b/tests/auto/opengl/opengl.pro
similarity index 100%
rename from tests/auto/opengl.pro
rename to tests/auto/opengl/opengl.pro
diff --git a/tests/auto/qgl/.gitignore b/tests/auto/opengl/qgl/.gitignore
similarity index 100%
rename from tests/auto/qgl/.gitignore
rename to tests/auto/opengl/qgl/.gitignore
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/opengl/qgl/qgl.pro
similarity index 100%
rename from tests/auto/qgl/qgl.pro
rename to tests/auto/opengl/qgl/qgl.pro
diff --git a/tests/auto/opengl/qgl/qgl.qrc b/tests/auto/opengl/qgl/qgl.qrc
new file mode 100644
index 00000000000..70f425c1b94
--- /dev/null
+++ b/tests/auto/opengl/qgl/qgl.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file alias="designer.png">../../gui/image/qpixmap/images/designer.png</file>
+</qresource>
+</RCC>
diff --git a/tests/auto/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
similarity index 100%
rename from tests/auto/qgl/tst_qgl.cpp
rename to tests/auto/opengl/qgl/tst_qgl.cpp
diff --git a/tests/auto/qglbuffer/qglbuffer.pro b/tests/auto/opengl/qglbuffer/qglbuffer.pro
similarity index 100%
rename from tests/auto/qglbuffer/qglbuffer.pro
rename to tests/auto/opengl/qglbuffer/qglbuffer.pro
diff --git a/tests/auto/qglbuffer/tst_qglbuffer.cpp b/tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
similarity index 100%
rename from tests/auto/qglbuffer/tst_qglbuffer.cpp
rename to tests/auto/opengl/qglbuffer/tst_qglbuffer.cpp
diff --git a/tests/auto/qglfunctions/qglfunctions.pro b/tests/auto/opengl/qglfunctions/qglfunctions.pro
similarity index 100%
rename from tests/auto/qglfunctions/qglfunctions.pro
rename to tests/auto/opengl/qglfunctions/qglfunctions.pro
diff --git a/tests/auto/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
similarity index 100%
rename from tests/auto/qglfunctions/tst_qglfunctions.cpp
rename to tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
diff --git a/tests/auto/qglthreads/qglthreads.pro b/tests/auto/opengl/qglthreads/qglthreads.pro
similarity index 100%
rename from tests/auto/qglthreads/qglthreads.pro
rename to tests/auto/opengl/qglthreads/qglthreads.pro
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
similarity index 100%
rename from tests/auto/qglthreads/tst_qglthreads.cpp
rename to tests/auto/opengl/qglthreads/tst_qglthreads.cpp
diff --git a/tests/auto/qglthreads/tst_qglthreads.h b/tests/auto/opengl/qglthreads/tst_qglthreads.h
similarity index 100%
rename from tests/auto/qglthreads/tst_qglthreads.h
rename to tests/auto/opengl/qglthreads/tst_qglthreads.h
diff --git a/tests/auto/qgl/qgl.qrc b/tests/auto/qgl/qgl.qrc
deleted file mode 100644
index 42281afc984..00000000000
--- a/tests/auto/qgl/qgl.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file alias="designer.png">../gui/image/qpixmap/images/designer.png</file>
-</qresource>
-</RCC>