diff --git a/hw/xfree86/drivers/meson.build b/hw/xfree86/drivers/meson.build
new file mode 100644
index 0000000000..4078ee7d99
--- /dev/null
+++ b/hw/xfree86/drivers/meson.build
@@ -0,0 +1,7 @@
+if build_modesetting
+   subdir('modesetting')
+endif
+
+if get_option('xf86-input-inputtest')
+    subdir('inputtest')
+endif
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index f2fc34ce2d..06baa23445 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -137,12 +137,8 @@ subdir('shadowfb')
 if build_vgahw
     subdir('vgahw')
 endif
-if build_modesetting
-   subdir('drivers/modesetting')
-endif
-if get_option('xf86-input-inputtest')
-    subdir('drivers/inputtest')
-endif
+
+subdir('drivers')
 
 meson.add_install_script(
     'sh', '-c',