diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
index a2d69905e57..fa3e9d33f7e 100644
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
+++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
@@ -37,23 +37,13 @@
 **
 ****************************************************************************/
 
-// Test both EGLDevice/Output/Stream and DRM as we only use them in combination.
-//
-// Other KMS/DRM tests relying on pkgconfig for libdrm are not suitable since
-// some systems do not use pkgconfig for the graphics stuff.
-
-#include <stdlib.h>
-#include <stdint.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <xf86drm.h>
-#include <xf86drmMode.h>
 
 int main(int, char **)
 {
     EGLDeviceEXT device = 0;
     EGLStreamKHR stream = 0;
     EGLOutputLayerEXT layer = 0;
-    drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0);
     return EGL_DRM_CRTC_EXT;
 }
diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
index d0945465a05..0bb8c66cb1a 100644
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
+++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
@@ -6,10 +6,4 @@ for(p, QMAKE_LIBDIR_EGL) {
 
 INCLUDEPATH += $$QMAKE_INCDIR_EGL
 LIBS += $$QMAKE_LIBS_EGL
-CONFIG += link_pkgconfig
-!contains(QT_CONFIG, no-pkg-config) {
-    PKGCONFIG += libdrm
-} else {
-    LIBS += -ldrm
-}
 CONFIG -= qt
diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
index 5147bc82da3..ff6b1f62998 100644
--- a/config.tests/qpa/kms/kms.pro
+++ b/config.tests/qpa/kms/kms.pro
@@ -1,4 +1,8 @@
 SOURCES = kms.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += libdrm
+!contains(QT_CONFIG, no-pkg-config) {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libdrm
+} else {
+    LIBS += -ldrm
+}
 CONFIG -= qt
diff --git a/configure.json b/configure.json
index f2b0df292d7..ad8e4cf32fa 100644
--- a/configure.json
+++ b/configure.json
@@ -1863,7 +1863,7 @@
         },
         "eglfs_egldevice": {
             "description": "EGLFS EGLDevice",
-            "condition": "features.eglfs && tests.egl-egldevice",
+            "condition": "features.eglfs && tests.egl-egldevice && features.kms",
             "output": [ "publicQtConfig" ]
         },
         "eglfs_gbm": {