diff --git a/debian/changelog b/debian/changelog
index bad6254821..ca2249ab4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ gtk+3.0 (3.24.0-4) UNRELEASED; urgency=medium
         - 10 background-origin.ui
   * Sort dependency lists (wrap-and-sort -a)
   * d/gtk-3-examples.install: Sort file list (wrap-and-sort -a)
+  * Use the same Xvfb screen configuration as in the upstream GTK+ 4
+    Gitlab-CI tests. This will hopefully make GLX work (see also #874077)
 
  -- Simon McVittie <smcv@debian.org>  Thu, 13 Sep 2018 08:29:08 +0100
 
diff --git a/debian/tests/build b/debian/tests/build
index 2b84dceff9..c903d4b4c2 100755
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -38,5 +38,6 @@ EOF
 gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-3.0`
 echo "build: OK"
 [ -x gtktest ]
-xvfb-run ./gtktest
+xvfb-run -a -s "-screen 0 1024x768x24" \
+./gtktest
 echo "run: OK"
diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index fc38ff33ec..d213042687 100755
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -12,7 +12,7 @@ export GIO_USE_VOLUME_MONITOR=unix
 export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
 
 exec dbus-run-session -- \
-xvfb-run -a \
+xvfb-run -a -s "-screen 0 1024x768x24" \
 gnome-desktop-testing-runner \
 --report-directory="$AUTOPKGTEST_ARTIFACTS" \
 --tap \
diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi
index a503b25087..2c2c4d2769 100755
--- a/debian/tests/python3-gi
+++ b/debian/tests/python3-gi
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-xvfb-run python3 <<EOF
+xvfb-run -a -s "-screen 0 1024x768x24" \
+python3 <<EOF
 from gi.repository import GLib, Gtk
 
 def do_quit(user_data):