23 files changed, 19 insertions, 19 deletions
diff --git a/config.tests/common/atomicfptr/icc2016_mac.diff b/config.tests/atomicfptr/icc2016_mac.diff
index 5de3b6e19a..5de3b6e19a 100644
--- a/config.tests/common/atomicfptr/icc2016_mac.diff
+++ b/config.tests/atomicfptr/icc2016_mac.diff
diff --git a/config.tests/common/atomicfptr/qnx66.txt b/config.tests/atomicfptr/qnx66.txt
index b4ea9d65b5..b4ea9d65b5 100644
--- a/config.tests/common/atomicfptr/qnx66.txt
+++ b/config.tests/atomicfptr/qnx66.txt
diff --git a/config.tests/common/avx512/avx512.cpp b/config.tests/avx512/avx512.cpp
index ca1a5d1357..ca1a5d1357 100644
--- a/config.tests/common/avx512/avx512.cpp
+++ b/config.tests/avx512/avx512.cpp
diff --git a/config.tests/common/avx512/avx512.pro b/config.tests/avx512/avx512.pro
index 1edf5e5432..1edf5e5432 100644
--- a/config.tests/common/avx512/avx512.pro
+++ b/config.tests/avx512/avx512.pro
diff --git a/config.tests/mac/corewlan/corewlan.pro b/config.tests/corewlan/corewlan.pro
index 97e864f476..97e864f476 100644
--- a/config.tests/mac/corewlan/corewlan.pro
+++ b/config.tests/corewlan/corewlan.pro
diff --git a/config.tests/mac/corewlan/corewlantest.mm b/config.tests/corewlan/corewlantest.mm
index 73b4d0d145..73b4d0d145 100644
--- a/config.tests/mac/corewlan/corewlantest.mm
+++ b/config.tests/corewlan/corewlantest.mm
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp b/config.tests/gnu-libiconv/gnu-libiconv.cpp
index fe4b87b923..fe4b87b923 100644
--- a/config.tests/unix/gnu-libiconv/gnu-libiconv.cpp
+++ b/config.tests/gnu-libiconv/gnu-libiconv.cpp
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/gnu-libiconv/gnu-libiconv.pro
index 4008f882eb..4008f882eb 100644
--- a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
+++ b/config.tests/gnu-libiconv/gnu-libiconv.pro
diff --git a/config.tests/unix/iconv/iconv.cpp b/config.tests/iconv/iconv.cpp
index be4236436f..be4236436f 100644
--- a/config.tests/unix/iconv/iconv.cpp
+++ b/config.tests/iconv/iconv.cpp
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/iconv/iconv.pro
index 65273ccc94..65273ccc94 100644
--- a/config.tests/unix/iconv/iconv.pro
+++ b/config.tests/iconv/iconv.pro
diff --git a/config.tests/unix/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp
index d33b62389c..d33b62389c 100644
--- a/config.tests/unix/openssl/openssl.cpp
+++ b/config.tests/openssl/openssl.cpp
diff --git a/config.tests/unix/openssl/openssl.pro b/config.tests/openssl/openssl.pro
index a023aee4aa..a023aee4aa 100644
--- a/config.tests/unix/openssl/openssl.pro
+++ b/config.tests/openssl/openssl.pro
diff --git a/config.tests/unix/stl/stl.pro b/config.tests/stl/stl.pro
index 7303e8d31c..7303e8d31c 100644
--- a/config.tests/unix/stl/stl.pro
+++ b/config.tests/stl/stl.pro
diff --git a/config.tests/unix/stl/stltest.cpp b/config.tests/stl/stltest.cpp
index a7a36ba0d3..a7a36ba0d3 100644
--- a/config.tests/unix/stl/stltest.cpp
+++ b/config.tests/stl/stltest.cpp
diff --git a/config.tests/unix/sun-libiconv/sun-libiconv.pro b/config.tests/sun-libiconv/sun-libiconv.pro
index 923afc7dd2..923afc7dd2 100644
--- a/config.tests/unix/sun-libiconv/sun-libiconv.pro
+++ b/config.tests/sun-libiconv/sun-libiconv.pro
diff --git a/config.tests/common/verifyspec/verifyspec.cpp b/config.tests/verifyspec/verifyspec.cpp
index bd5560bf02..bd5560bf02 100644
--- a/config.tests/common/verifyspec/verifyspec.cpp
+++ b/config.tests/verifyspec/verifyspec.cpp
diff --git a/config.tests/common/verifyspec/verifyspec.pro b/config.tests/verifyspec/verifyspec.pro
index 11a280e4ce..11a280e4ce 100644
--- a/config.tests/common/verifyspec/verifyspec.pro
+++ b/config.tests/verifyspec/verifyspec.pro
diff --git a/config.tests/common/xlocalescanprint/qglobal.h b/config.tests/xlocalescanprint/qglobal.h
index 98de822847..98de822847 100644
--- a/config.tests/common/xlocalescanprint/qglobal.h
+++ b/config.tests/xlocalescanprint/qglobal.h
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp b/config.tests/xlocalescanprint/xlocalescanprint.cpp
index 2f1f28f74e..2f1f28f74e 100644
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.cpp
+++ b/config.tests/xlocalescanprint/xlocalescanprint.cpp
diff --git a/config.tests/common/xlocalescanprint/xlocalescanprint.pro b/config.tests/xlocalescanprint/xlocalescanprint.pro
index a37a01f227..a37a01f227 100644
--- a/config.tests/common/xlocalescanprint/xlocalescanprint.pro
+++ b/config.tests/xlocalescanprint/xlocalescanprint.pro
diff --git a/configure.json b/configure.json
index 80278b3b69..6221c9803a 100644
--- a/configure.json
+++ b/configure.json
@@ -229,7 +229,7 @@
         "verifyspec": {
             "label": "valid makespec",
             "type": "verifySpec",
-            "test": "common/verifyspec"
+            "test": "verifyspec"
         },
         "architecture": {
             "label": "target architecture",
@@ -256,7 +256,7 @@
         "stl": {
             "label": "STL compatibility",
             "type": "compile",
-            "test": "unix/stl"
+            "test": "stl"
         },
         "c++14": {
             "label": "C++14 support",
@@ -497,55 +497,55 @@
         "avx512f": {
             "label": "AVX512 F instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=F"
         },
         "avx512er": {
             "label": "AVX512 ER instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=ER"
         },
         "avx512cd": {
             "label": "AVX512 CD instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=CD"
         },
         "avx512pf": {
             "label": "AVX512 PF instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=PF"
         },
         "avx512dq": {
             "label": "AVX512 DQ instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=DQ"
         },
         "avx512bw": {
             "label": "AVX512 BW instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=BW"
         },
         "avx512vl": {
             "label": "AVX512 VL instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=VL"
         },
         "avx512ifma": {
             "label": "AVX512 IFMA instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=IFMA"
         },
         "avx512vbmi": {
             "label": "AVX512 VBMI instructions",
             "type": "compile",
-            "test": "common/avx512",
+            "test": "avx512",
             "args": "AVX512=VBMI"
         },
         "mips_dsp": {
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 5596280250..91f7bb4fd6 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -49,7 +49,7 @@
         "gnu_iconv": {
             "label": "GNU libiconv",
             "export": "iconv",
-            "test": "unix/gnu-libiconv",
+            "test": "gnu-libiconv",
             "sources": [
                 "-liconv"
             ]
@@ -267,12 +267,12 @@
         "posix-iconv": {
             "label": "POSIX iconv",
             "type": "compile",
-            "test": "unix/iconv"
+            "test": "iconv"
         },
         "sun-iconv": {
             "label": "SUN libiconv",
             "type": "compile",
-            "test": "unix/sun-libiconv"
+            "test": "sun-libiconv"
         },
         "inotify": {
             "label": "inotify",
@@ -364,7 +364,7 @@
         "xlocalescanprint": {
             "label": "xlocale.h (or equivalents)",
             "type": "compile",
-            "test": "common/xlocalescanprint"
+            "test": "xlocalescanprint"
         }
     },
 
@@ -774,7 +774,7 @@ You need to use libdouble-conversion for double/string conversion."
             "condition": "!tests.atomicfptr",
             "message": "detected a std::atomic implementation that fails for function pointers.
 Please apply the patch corresponding to your Standard Library vendor, found in
-  qtbase/config.tests/common/atomicfptr"
+  qtbase/config.tests/atomicfptr"
         }
     ],
 
diff --git a/src/network/configure.json b/src/network/configure.json
index c77004d4ba..6e7ce25051 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -25,7 +25,7 @@
         "corewlan": {
             "label": "CoreWLan",
             "export": "",
-            "test": "mac/corewlan",
+            "test": "corewlan",
             "sources": [
                 "-framework CoreWLAN -framework Foundation"
             ]
@@ -53,7 +53,7 @@
         "openssl_headers": {
             "label": "OpenSSL Headers",
             "export": "openssl",
-            "test": "unix/openssl",
+            "test": "openssl",
             "sources": [
                 {
                     "comment": "placeholder for OPENSSL_PATH",
@@ -63,7 +63,7 @@
         },
         "openssl": {
             "label": "OpenSSL",
-            "test": "unix/openssl",
+            "test": "openssl",
             "sources": [
                 { "type": "openssl" },
                 {