diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fae44990..35daa5e61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,7 +285,7 @@ test fedora xcb:
     - export CAIRO_TEST_IGNORE_xcb_render_0_0_argb32=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-render-0-0-argb32.txt)
     - export CAIRO_TEST_IGNORE_xcb_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-render-0-0-rgb24.txt)
     - export CAIRO_TEST_IGNORE_xcb_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xcb-fallback-rgb24.txt)
-    - export CAIRO_TEST_TARGET="xcb,xcb-window,xcb-window&,xcb-render-0_0,xcb-fallback"
+    - export CAIRO_TEST_TARGET=xcb
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
@@ -297,7 +297,7 @@ test fedora xlib:
     - export CAIRO_TEST_IGNORE_xlib_window_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-window-rgb24.txt)
     - export CAIRO_TEST_IGNORE_xlib_render_0_0_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-render-0-0-rgb24.txt)
     - export CAIRO_TEST_IGNORE_xlib_fallback_rgb24=$(tr '\n' ',' < .gitlab-ci/ignore-xlib-fallback-rgb24.txt)
-    - export CAIRO_TEST_TARGET="xlib,xlib-window,xlib-render-0_0,xlib-fallback"
+    - export CAIRO_TEST_TARGET=xlib
     - export srcdir=../../test
     - (cd builddir/test && xvfb-run ./cairo-test-suite)
 
diff --git a/boilerplate/make-cairo-boilerplate-constructors.py b/boilerplate/make-cairo-boilerplate-constructors.py
index 40198ed1a..a7d2b5010 100644
--- a/boilerplate/make-cairo-boilerplate-constructors.py
+++ b/boilerplate/make-cairo-boilerplate-constructors.py
@@ -1,5 +1,4 @@
-# IMPORTANT: Keep in sync with make-cairo-boilerplate-constructors.sh
-#            and test/make-cairo-test-constructors.py!
+# IMPORTANT: Keep in sync with test/make-cairo-test-constructors.py!
 import argparse
 import sys
 import re
@@ -21,6 +20,8 @@ if __name__=='__main__':
                 if match_boilerplate_line.match(l):
                     boilerplate_names.append(match_boilerplate_name.match(l).group(1))
 
+    boilerplate_names.sort()
+
     with open(args.output, 'w', encoding='utf-8') as f:
         f.write('/* WARNING: Autogenerated file - see %s! */\n\n' % sys.argv[0])
         f.write('#include "cairo-boilerplate-private.h"\n\n')
diff --git a/boilerplate/make-cairo-boilerplate-constructors.sh b/boilerplate/make-cairo-boilerplate-constructors.sh
deleted file mode 100644
index 1503e9970..000000000
--- a/boilerplate/make-cairo-boilerplate-constructors.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-#
-# IMPORTANT: Keep in sync with make-cairo-boilerplate-constructors.py!
-
-if test $# -eq 0; then
-    echo "$0: no input files." >&2
-    exit 0
-fi
-
-cat <<HERE
-/* WARNING: Autogenerated file - see $0! */
-
-#include "cairo-boilerplate-private.h"
-
-void _cairo_boilerplate_register_all (void);
-
-HERE
-
-cat "$@" |  sed '/^CAIRO_BOILERPLATE/!d; s/CAIRO_BOILERPLATE.*(\(.*\),.*/extern void _register_\1 (void);/'
-
-cat <<HERE
-
-void
-_cairo_boilerplate_register_all (void)
-{
-HERE
-
-cat "$@" |  sed '/^CAIRO_BOILERPLATE/!d; s/CAIRO_BOILERPLATE.*(\(.*\),.*/    _register_\1 ();/'
-
-echo "}"
-
diff --git a/test/make-cairo-test-constructors.py b/test/make-cairo-test-constructors.py
index 0e7d867bb..cc0f69135 100644
--- a/test/make-cairo-test-constructors.py
+++ b/test/make-cairo-test-constructors.py
@@ -20,6 +20,8 @@ if __name__=='__main__':
                 if match_test_line.match(l):
                     test_names.append(match_test_name.match(l).group(1))
 
+    test_names.sort()
+
     with open(args.output, 'w', encoding='utf-8') as f:
         f.write('/* WARNING: Autogenerated file - see %s! */\n\n' % sys.argv[0])
         f.write('#include "cairo-test-private.h"\n\n')
diff --git a/test/make-cairo-test-constructors.sh b/test/make-cairo-test-constructors.sh
deleted file mode 100644
index a03d61c19..000000000
--- a/test/make-cairo-test-constructors.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if test $# -eq 0; then
-    echo "$0: no input files." >&2
-    exit 1
-fi
-
-cat <<HERE
-/* WARNING: Autogenerated file - see $0! */
-
-#include "cairo-test-private.h"
-
-void _cairo_test_runner_register_tests (void);
-
-HERE
-
-cat "$@" |  sed '/^CAIRO_TEST/!d; s/CAIRO_TEST.*(\(.*\),.*/extern void _register_\1 (void);/'
-cat <<HERE
-
-void
-_cairo_test_runner_register_tests (void)
-{
-HERE
-
-cat "$@" |  sed '/^CAIRO_TEST/!d; s/CAIRO_TEST.*(\(.*\),.*/    _register_\1 ();/'
-
-echo "}"
-
-