diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 290a5d0d19c..4638dc72c43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,8 @@
 ################
 
 workflow:
+  auto_cancel:
+    on_job_failure: all
   rules:
   # These 3 rules from https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml
     # Run on merge requests
@@ -144,6 +146,11 @@ default:
 
 .default-stage: &default-stage
   stage: 🗜️ Test
+  needs:
+    # Start the child jobs as soon as phpcs passes.
+    - "🧹 PHP Coding standards (PHPCS)"
+    - "📔 Spell-checking"
+
   trigger:
     # Rely on the status of the child pipeline.
     strategy: depend