diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp
similarity index 100%
rename from config.tests/x11/fontconfig/fontconfig.cpp
rename to config.tests/unix/fontconfig/fontconfig.cpp
diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro
similarity index 100%
rename from config.tests/x11/fontconfig/fontconfig.pro
rename to config.tests/unix/fontconfig/fontconfig.pro
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
index e84158e25a7..c0cc02d5640 100644
--- a/config.tests/unix/freetype/freetype.pro
+++ b/config.tests/unix/freetype/freetype.pro
@@ -1,5 +1,4 @@
 SOURCES = freetype.cpp
-CONFIG += x11
 CONFIG -= qt
 LIBS += -lfreetype
 include(freetype.pri)
diff --git a/configure b/configure
index 17ea5b8591b..747ebf3b201 100755
--- a/configure
+++ b/configure
@@ -4535,11 +4535,14 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then
         QT_CFLAGS_FONTCONFIG=
         QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
     fi
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
         QT_CONFIG="$QT_CONFIG fontconfig"
         QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG"
         QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG"
+        CFG_FONTCONFIG=yes
         CFG_LIBFREETYPE=system
+    else
+        CFG_FONTCONFIG=no
     fi
 
 fi