diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d4ca3deb69715049f1fff019b12c0d545e0aaca..3caf122d075a2aa33888764a5e2918e80166dc4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 variables:
   TEST_OS7: 'True'
   TEST_OS8s: 'True'
-  TEST_OS9s: 'True'
+  TEST_OS9: 'True'
   # Only test RH images on demand
   TEST_OSRH7: 'False'
   TEST_OSRH8: 'False'
diff --git a/README.md b/README.md
index 8a90eaf16b9a0013a5cc5712c26c433706fa448b..fa701d5d7a21c39e6772112e1b87d648f47d8267 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Puppet jobs have to be run on custom runners (hostgroup `punch/cirunners`) manag
 * `TEST_PUPPET`: Create Puppet-managed machines. Defaults to `False`.
 * `TEST_OS7`: Test the CC7 image. Defaults to `True`.
 * `TEST_OS8s`: Test the CS8 image. Defaults to `True`.
-* `TEST_OS9s`: Test the CS9 image. Defaults to `True`.
+* `TEST_OS9`: Test the CS9 image. Defaults to `True`.
 * `TEST_OSRH7`: Test the RH7 image. Defaults to `False`.
 * `TEST_OSRH8`: Test the RH8 image. Defaults to `False`.
 * `IMAGE`: The image to test, either the ID or the name. If not specified (the default), test the latest production image.
@@ -34,7 +34,7 @@ In order to run any tests, there must be *at least one* `True` value in *each* o
 |----------------|------------------|------------------|
 | `TEST_OS7`     | `TEST_VIRTUAL`   | `TEST_UNMANAGED` |
 | `TEST_OS8s`    | `TEST_PHYSICAL`  | `TEST_PUPPET`    |
-| `TEST_OS9s`    |                  |                  |
+| `TEST_OS9`     |                  |                  |
 | `TEST_OSRH7`   |                  |                  |
 | `TEST_OSRH8`   |                  |                  |
 
diff --git a/ci/c9s.yml b/ci/c9s.yml
index 4d465eafd0290756e1a81007781ce6c41e2dc504..cc4fdb1774210e21edf27a6d61f1acc33349e544 100644
--- a/ci/c9s.yml
+++ b/ci/c9s.yml
@@ -5,7 +5,7 @@ cs9_unman_physical:
     ARCH: x96_64
   only:
     variables:
-      - $TEST_OS9s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
+      - $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_UNMANAGED == 'True'
   allow_failure: true
 
 cs9_unman_virtual:
@@ -16,7 +16,7 @@ cs9_unman_virtual:
     DELETE_FAILURES: "False"
   only:
     variables:
-      - $TEST_OS9s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True'
+      - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_UNMANAGED == 'True'
   allow_failure: true
 
 cs9_puppet_physical:
@@ -26,7 +26,7 @@ cs9_puppet_physical:
     ARCH: x96_64
   only:
     variables:
-      - $TEST_OS9s == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
+      - $TEST_OS9 == 'True' && $TEST_PHYSICAL == 'True' && $TEST_PUPPET == 'True'
   allow_failure: true
 
 cs9_puppet_virtual:
@@ -36,5 +36,5 @@ cs9_puppet_virtual:
     ARCH: x96_64
   only:
     variables:
-      - $TEST_OS9s == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
+      - $TEST_OS9 == 'True' && $TEST_VIRTUAL == 'True' && $TEST_PUPPET == 'True'
   allow_failure: true