diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff98c8503..41161caef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,8 +215,9 @@ test:
   before_script:
     - sudo meson install -C mutter/build
     - mkdir -m 700 $XDG_RUNTIME_DIR
+    - mkdir -m 1777 /tmp/.X11-unix
   script:
-    - dbus-run-session -- xvfb-run meson test -C build --no-rebuild --timeout-multiplier 5
+    - dbus-run-session -- meson test -C build --no-rebuild --timeout-multiplier 5
   artifacts:
     expire_in: 1 day
     paths:
@@ -289,8 +290,9 @@ dist:
   before_script:
     - sudo meson install -C mutter/build
     - mkdir -m 700 $XDG_RUNTIME_DIR
+    - mkdir -m 1777 /tmp/.X11-unix
   script:
-    - dbus-run-session xvfb-run meson dist -C build --include-subprojects
+    - dbus-run-session meson dist -C build --include-subprojects
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       changes:
diff --git a/src/st/test-theme.c b/src/st/test-theme.c
index 9cf5c3d32..f8f958bde 100644
--- a/src/st/test-theme.c
+++ b/src/st/test-theme.c
@@ -550,7 +550,7 @@ main (int argc, char **argv)
   /* meta_init() cds to $HOME */
   cwd = g_get_current_dir ();
 
-  context = meta_create_test_context (META_CONTEXT_TEST_TYPE_NESTED,
+  context = meta_create_test_context (META_CONTEXT_TEST_TYPE_TEST,
                                       META_CONTEXT_TEST_FLAG_NONE);
   if (!meta_context_configure (context, &argc, &argv, &error))
     g_error ("Failed to configure: %s", error->message);