diff --git a/tests/auto/corelib/codecs/codecs.pro b/tests/auto/corelib/codecs/codecs.pro
new file mode 100644
index 00000000000..41c5d8e46d3
--- /dev/null
+++ b/tests/auto/corelib/codecs/codecs.pro
@@ -0,0 +1,3 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qtextcodec
diff --git a/tests/auto/qtextcodec/.gitattributes b/tests/auto/corelib/codecs/qtextcodec/.gitattributes
similarity index 100%
rename from tests/auto/qtextcodec/.gitattributes
rename to tests/auto/corelib/codecs/qtextcodec/.gitattributes
diff --git a/tests/auto/qtextcodec/.gitignore b/tests/auto/corelib/codecs/qtextcodec/.gitignore
similarity index 100%
rename from tests/auto/qtextcodec/.gitignore
rename to tests/auto/corelib/codecs/qtextcodec/.gitignore
diff --git a/tests/auto/qtextcodec/QT4-crashtest.txt b/tests/auto/corelib/codecs/qtextcodec/QT4-crashtest.txt
similarity index 100%
rename from tests/auto/qtextcodec/QT4-crashtest.txt
rename to tests/auto/corelib/codecs/qtextcodec/QT4-crashtest.txt
diff --git a/tests/auto/qtextcodec/echo/echo.pro b/tests/auto/corelib/codecs/qtextcodec/echo/echo.pro
similarity index 100%
rename from tests/auto/qtextcodec/echo/echo.pro
rename to tests/auto/corelib/codecs/qtextcodec/echo/echo.pro
diff --git a/tests/auto/qtextcodec/echo/main.cpp b/tests/auto/corelib/codecs/qtextcodec/echo/main.cpp
similarity index 100%
rename from tests/auto/qtextcodec/echo/main.cpp
rename to tests/auto/corelib/codecs/qtextcodec/echo/main.cpp
diff --git a/tests/auto/qtextcodec/korean.txt b/tests/auto/corelib/codecs/qtextcodec/korean.txt
similarity index 100%
rename from tests/auto/qtextcodec/korean.txt
rename to tests/auto/corelib/codecs/qtextcodec/korean.txt
diff --git a/tests/auto/qtextcodec/qtextcodec.pro b/tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
similarity index 100%
rename from tests/auto/qtextcodec/qtextcodec.pro
rename to tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/corelib/codecs/qtextcodec/test/test.pro
similarity index 100%
rename from tests/auto/qtextcodec/test/test.pro
rename to tests/auto/corelib/codecs/qtextcodec/test/test.pro
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
similarity index 100%
rename from tests/auto/qtextcodec/tst_qtextcodec.cpp
rename to tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
diff --git a/tests/auto/qtextcodec/utf8.txt b/tests/auto/corelib/codecs/qtextcodec/utf8.txt
similarity index 100%
rename from tests/auto/qtextcodec/utf8.txt
rename to tests/auto/corelib/codecs/qtextcodec/utf8.txt
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index d9da997122e..4c84fbbbcb1 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -1,3 +1,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
-   animation
+   animation \
+   codecs
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 2e36ef5e854..aa8056ebaac 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -167,7 +167,6 @@ SUBDIRS=\
     qtablewidget \
     qtcpsocket \
     qtextblock \
-    qtextcodec \
     qtextcursor \
     qtextdocumentfragment \
     qtextdocumentlayout \