diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index a0d46ea7c9..01c05c6819 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -15,7 +15,7 @@ on:
 jobs:
     xserver-build-ubuntu:
         env:
-            MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=false -Dxcsecurity=true -Dxorg=true -Dxvfb=true -Dxnest=true
+            MESON_ARGS: -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=false -Dxcsecurity=true -Dxorg=true -Dxvfb=true -Dxnest=true -Dtest_xephyr_gles=false
             LIBGL_ALWAYS_SOFTWARE: 1
             GALLIUM_DRIVER: llvmpipe
             PIGLIT_PLATFORM: x11_egl
diff --git a/meson_options.txt b/meson_options.txt
index 952ffa4158..e9f4ce5f4c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -151,3 +151,5 @@ option('docs-pdf', type: 'combo', choices: ['true', 'false', 'auto'], value: 'au
 # testsuite fine tuning - some things might not run everywhere
 option('test_rendercheck_triangles', type: 'boolean', value: false,
        description: 'testsuite: run rendercheck triangles tests (might fail on Xephyr)')
+option('test_xephyr_gles', type: 'boolean', value: true,
+       description: 'testsuite: run gles2/gles3 tests on Xephyr (might fail w/o DRI)')
diff --git a/test/meson.build b/test/meson.build
index 8eac0f14b5..f97aa3ea21 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -112,7 +112,11 @@ if get_option('xvfb')
     endif
 
     if get_option('xephyr') and build_glamor
-        foreach testsuite : ['','-gles2','-gles3']
+        glamor_tests = ['']
+        if get_option('test_xephyr_gles')
+            glamor_tests += ['-gles2','-gles3']
+        endif
+        foreach testsuite : glamor_tests
             test_env = piglit_env
             if(testsuite == '-gles2')
                 test_env = gles20_env