diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df15a050d..ff8fe1adf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,45 @@ image: registry.gitlab.gnome.org/gnome/mutter/master:v1
 
 stages:
  - build
+ - test
 
 build-mutter:
   stage: build
   script:
-    - meson . build -Degl_device=true -Dwayland_eglstream=true
+    - meson . build -Degl_device=true -Dwayland_eglstream=true -Dheadless_tests=enabled
     - ninja -C build
     - ninja -C build install
+    - meson test -v -C build --suite headless
+  # artifacts:
+  #   paths:
+  #     - build
+
+# test-cogl:
+#   stage: test
+#   dependencies:
+#     - build-mutter
+#   artifacts:
+#     paths:
+#       - build
+#   script:
+#     - meson test -v -C build --suite cogl-headless
+
+# test-clutter:
+#   stage: test
+#   dependencies:
+#     - build-mutter
+#   artifacts:
+#     paths:
+#       - build
+#   script:
+#     - meson test -v -C build --suite clutter-headless
+
+# test-mutter:
+#   stage: test
+#   dependencies:
+#     - build-mutter
+#   artifacts:
+#     paths:
+#       - build
+#   script:
+#     - meson test -v -C build --suite mutter-headless
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index eba733c79..541707912 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -7,5 +7,8 @@ RUN dnf -y update && dnf -y upgrade && \
 # Until Fedora catches up with meson build-deps
     dnf install -y meson xorg-x11-server-Xorg gnome-settings-daemon-devel egl-wayland-devel xorg-x11-server-Xwayland && \
 
+# To enable testing headless
+    dnf install -y xorg-x11-server-Xvfb && \
+
     dnf install -y intltool redhat-rpm-config make && \
     dnf clean all
diff --git a/clutter/tests/conform/meson.build b/clutter/tests/conform/meson.build
index 8355187bf..a9b6a947a 100644
--- a/clutter/tests/conform/meson.build
+++ b/clutter/tests/conform/meson.build
@@ -89,6 +89,7 @@ foreach test : clutter_conform_tests
       suite: ['clutter-headless', 'clutter-headless/conform', 'headless'],
       env: test_env,
       is_parallel: false,
+      timeout: 60,
     )
   endif
 endforeach