diff --git a/configure b/configure
index 48dea87fb7..9fcf066928 100755
--- a/configure
+++ b/configure
@@ -452,11 +452,6 @@ fi
 # initalize variables
 #-------------------------------------------------------------------------------
 
-# Use CC/CXX to run config.tests
-mkdir -p "$outpath/config.tests"
-rm -f "$outpath/config.tests/.qmake.cache"
-: > "$outpath/config.tests/.qmake.cache"
-
 # QTDIR may be set and point to an old or system-wide Qt installation
 unset QTDIR
 
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index 74ad611ee5..7f3f710585 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -770,6 +770,7 @@ defineTest(qtConfTest_compile) {
         QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE"
 
     mkpath($$test_out_dir)|error()
+    write_file($$test_out_dir/.qmake.cache)|error()
 
     # add possible command line args
     qmake_args += $$qtConfPrepareArgs($$eval($${1}.args)) $$eval($${1}.literal_args)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index fc66220335..cfba57272f 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -93,7 +93,6 @@ Configure::Configure(int& argc, char** argv)
         QDir(buildPath).mkpath("bin");
 
         buildDir.mkpath("mkspecs");
-        buildDir.mkpath("config.tests");
     }
 
     dictionary[ "QT_INSTALL_PREFIX" ] = installPath;
@@ -479,25 +478,6 @@ void Configure::parseCmdLine()
     }
 }
 
-void Configure::prepareConfigTests()
-{
-    // Generate an empty .qmake.cache file for config.tests
-    QDir buildDir(buildPath);
-    bool success = true;
-    if (!buildDir.exists("config.tests"))
-        success = buildDir.mkdir("config.tests");
-
-    QString fileName(buildPath + "/config.tests/.qmake.cache");
-    QFile cacheFile(fileName);
-    success &= cacheFile.open(QIODevice::WriteOnly);
-    cacheFile.close();
-
-    if (!success) {
-        cout << "Failed to create file " << qPrintable(QDir::toNativeSeparators(fileName)) << endl;
-        dictionary[ "DONE" ] = "error";
-    }
-}
-
 void Configure::generateQDevicePri()
 {
     FileWriter deviceStream(buildPath + "/mkspecs/qdevice.pri");
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index b007f3c487..8d11f07457 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -52,7 +52,6 @@ public:
 
     void generateHeaders();
     void generateQDevicePri();
-    void prepareConfigTests();
 
     bool isDone();
     bool isOk();
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index f6c2722529..3fce934da5 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -63,11 +63,6 @@ int runConfigure( int argc, char** argv )
     if (!app.isOk())
         return 3;
 
-    // Prepare the config test build directory.
-    app.prepareConfigTests();
-    if (!app.isOk())
-        return 3;
-
     // run qmake based configure
     app.configure();
     if (!app.isOk())