diff --git a/src/meson.build b/src/meson.build
index f3dcac5b4bf..23d32c41a04 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -105,9 +105,6 @@ endif
 if with_gallium
   subdir('mesa')
   subdir('gallium')
-  if with_glx == 'dri'
-     subdir('glx')
-  endif
   # This has to be here since it requires libgallium, and subdir cannot
   # contain ..
   if with_tests
@@ -117,6 +114,9 @@ if with_gallium
     subdir('mesa/state_tracker/tests')
   endif
 endif
+if with_glx == 'dri'
+  subdir('glx')
+endif
 if with_gbm
   subdir('gbm')
 else