diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 821722d3..b1d3efba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ stages:
   - sanity check     # CI/commit checks
   - prep             # prep work like rebuilding the container images if there is a change
   - build            # for actually building and testing things in a container
-  - VM               # for running the test suite in a VM
+  - test-suite       # for running the test suite in a VM
   - valgrind         # for running the test suite under valgrind in a VM
   - distro           # distribs test
   - deploy           # trigger wayland's website generation
@@ -458,7 +458,7 @@ freebsd:11.2@container-clean:
   extends:
     - .policy
     - .fdo.distribution-image@fedora
-  stage: VM
+  stage: test-suite
   tags:
     - kvm
   variables:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 2d6566a2..923f4f3e 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -51,7 +51,7 @@ stages:
   - sanity check     # CI/commit checks
   - prep             # prep work like rebuilding the container images if there is a change
   - build            # for actually building and testing things in a container
-  - VM               # for running the test suite in a VM
+  - test-suite       # for running the test suite in a VM
   - valgrind         # for running the test suite under valgrind in a VM
   - distro           # distribs test
   - deploy           # trigger wayland's website generation
@@ -338,7 +338,7 @@ freebsd:11.2@container-clean:
   extends:
     - .policy
     - .fdo.distribution-image@fedora
-  stage: VM
+  stage: test-suite
   tags:
     - kvm
   variables: