diff --git a/.qmake.conf b/.qmake.conf
index a988f0face6e1d7a181f8a7d1b08fdea22d77d12..71d8c7d74d129b58e793bf69ac78495b1148ad80 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,5 +1,3 @@
-QMAKEPATH += $$PWD/tools/qmake
-
 # Resolve root directories for sources
 QTWEBENGINE_ROOT = $$PWD
 QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
diff --git a/tools/qmake/config.tests/alsa/alsa.pro b/config.tests/alsa/alsa.pro
similarity index 100%
rename from tools/qmake/config.tests/alsa/alsa.pro
rename to config.tests/alsa/alsa.pro
diff --git a/tools/qmake/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
similarity index 100%
rename from tools/qmake/config.tests/alsa/alsatest.cpp
rename to config.tests/alsa/alsatest.cpp
diff --git a/tools/qmake/config.tests/khr/khr.cpp b/config.tests/khr/khr.cpp
similarity index 100%
rename from tools/qmake/config.tests/khr/khr.cpp
rename to config.tests/khr/khr.cpp
diff --git a/tools/qmake/config.tests/khr/khr.pro b/config.tests/khr/khr.pro
similarity index 100%
rename from tools/qmake/config.tests/khr/khr.pro
rename to config.tests/khr/khr.pro
diff --git a/tools/qmake/config.tests/libvpx/libvpx.cpp b/config.tests/libvpx/libvpx.cpp
similarity index 100%
rename from tools/qmake/config.tests/libvpx/libvpx.cpp
rename to config.tests/libvpx/libvpx.cpp
diff --git a/tools/qmake/config.tests/libvpx/libvpx.pro b/config.tests/libvpx/libvpx.pro
similarity index 100%
rename from tools/qmake/config.tests/libvpx/libvpx.pro
rename to config.tests/libvpx/libvpx.pro
diff --git a/tools/qmake/config.tests/snappy/snappy.cpp b/config.tests/snappy/snappy.cpp
similarity index 100%
rename from tools/qmake/config.tests/snappy/snappy.cpp
rename to config.tests/snappy/snappy.cpp
diff --git a/tools/qmake/config.tests/snappy/snappy.pro b/config.tests/snappy/snappy.pro
similarity index 100%
rename from tools/qmake/config.tests/snappy/snappy.pro
rename to config.tests/snappy/snappy.pro
diff --git a/tools/qmake/config.tests/srtp/srtp.cpp b/config.tests/srtp/srtp.cpp
similarity index 100%
rename from tools/qmake/config.tests/srtp/srtp.cpp
rename to config.tests/srtp/srtp.cpp
diff --git a/tools/qmake/config.tests/srtp/srtp.pro b/config.tests/srtp/srtp.pro
similarity index 100%
rename from tools/qmake/config.tests/srtp/srtp.pro
rename to config.tests/srtp/srtp.pro
diff --git a/tools/qmake/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp
similarity index 100%
rename from tools/qmake/config.tests/winversion/winversion.cpp
rename to config.tests/winversion/winversion.cpp
diff --git a/tools/qmake/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro
similarity index 100%
rename from tools/qmake/config.tests/winversion/winversion.pro
rename to config.tests/winversion/winversion.pro
diff --git a/configure.json b/configure.json
index 605807a365b40ccdd339d24dec35e92a1a38dd7a..0c9a1de64e89a341e2265eac83ee603813540e2a 100644
--- a/configure.json
+++ b/configure.json
@@ -4,8 +4,6 @@
         "printsupport"
     ],
 
-    "testDir": "tools/qmake/config.tests",
-
     "commandline": {
         "options": {
             "alsa": "boolean",
diff --git a/tools/qmake/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
similarity index 99%
rename from tools/qmake/mkspecs/features/configure.prf
rename to mkspecs/features/configure.prf
index 55a7c45a412c637b30356bb2556ed8dda1ac89b5..f60be817c4e222f1fc3d0de212e538881aaed0f9 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -11,7 +11,7 @@ defineTest(runConfigure) {
     # Ignore the cached config tests results in case they were not successful
     CONFIG += recheck
     #Override the config.tests path
-    QMAKE_CONFIG_TESTS_DIR = $$QTWEBENGINE_ROOT/tools/qmake/config.tests
+    QMAKE_CONFIG_TESTS_DIR = $$QTWEBENGINE_ROOT/config.tests
     CONFIG_TESTS = $$files($$QMAKE_CONFIG_TESTS_DIR/*.pro, true)
     log("Running configure tests$${EOL}")
     for(test, CONFIG_TESTS) {
diff --git a/tools/qmake/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/default_pre.prf
rename to mkspecs/features/default_pre.prf
diff --git a/tools/qmake/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/functions.prf
rename to mkspecs/features/functions.prf
diff --git a/tools/qmake/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
similarity index 100%
rename from tools/qmake/mkspecs/features/gn_generator.prf
rename to mkspecs/features/gn_generator.prf
diff --git a/qtwebengine.pro b/qtwebengine.pro
index b6e7358763c9089a97dfe2982c0f85a0fcb72774..c8f3555e33e7370b7044cbb0dd49c6696ce0b60f 100644
--- a/qtwebengine.pro
+++ b/qtwebengine.pro
@@ -16,9 +16,9 @@ isPlatformSupported() {
 OTHER_FILES = \
     tools/buildscripts/* \
     tools/scripts/* \
-    tools/qmake/config.tests/khr/* \
-    tools/qmake/config.tests/libcap/* \
-    tools/qmake/config.tests/libvpx/* \
-    tools/qmake/config.tests/snappy/* \
-    tools/qmake/config.tests/srtp/* \
-    tools/qmake/mkspecs/features/*
+    config.tests/khr/* \
+    config.tests/libcap/* \
+    config.tests/libvpx/* \
+    config.tests/snappy/* \
+    config.tests/srtp/* \
+    mkspecs/features/*