diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa034937218a65a13200dea0c8d7771c42c5f11..3230a55aa54102d6e81d675c7269c262cfd5d905 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-stages:
-  - test
-  - posttest
-
 #
 # Test-job template
 #
@@ -75,9 +71,7 @@ test:perl5.30-mysql:
 # downstream branches) - but then again, we do not trigger dependent
 # builds for PRs on Travis either.
 .dependent_template:
-  stage: posttest
-  # We want this to run even if any test jobs fail
-  when: always
+  stage: test
   only:
     - master
     - /^release/\d+$/
@@ -87,7 +81,7 @@ test:perl5.30-mysql:
 # ensembl-rest; disabled for now because that repo a) hasn't got
 # GitLab-CI config yet, and b) is still on the list in
 # trigger-dependent-build.sh.
-.post:trigger_rest:
+.test:trigger_rest:
   extends: .dependent_template
   trigger:
     project: ensembl-gh-mirror/ensembl-rest
@@ -101,7 +95,7 @@ test:perl5.30-mysql:
 # is the Travis 'create_request' permission but Travis permissions are
 # generated from GitHub ones and it seems that in order to have
 # 'create_request' on the latter one requires 'write' on the former.
-post:trigger_travis:
+test:trigger_travis:
   extends: .dependent_template
   image: alpine:3.10
   variables: