diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 921337583f9898aa102b7f9f6cda70d06e1cb52b..dbfd8e9fe9bb0d469d0ad612157e14495c240b3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,14 +26,14 @@ Python 2.7 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.7:
+Python 3:
   script:
-  - py_version=3.7
+  - PY_EXE=python3
   - EXTRA_INSTALL="numpy sympy pexpect"
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.7
+  - python3
   - maxima
   except:
   - tags
@@ -41,7 +41,7 @@ Python 3.7:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 Conda:
+Python 3 Conda:
   script:
   - CONDA_ENVIRONMENT=.test-py3.yml
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
@@ -54,7 +54,7 @@ Python 3.6 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.6 Apple:
+Python 3 Conda Apple:
   script:
   - CONDA_ENVIRONMENT=.test-py3.yml
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
@@ -70,11 +70,11 @@ Python 3.6 Apple:
 Pylint:
   script:
   - EXTRA_INSTALL="numpy sympy symengine scipy pexpect"
-  - py_version=3.7
+  - PY_EXE=python3
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh
   - ". ./prepare-and-run-pylint.sh pymbolic test/test_*.py"
   tags:
-  - python3.7
+  - python3
   except:
   - tags
 
@@ -93,6 +93,6 @@ Flake8:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
   - ". ./prepare-and-run-flake8.sh pymbolic test"
   tags:
-  - python3.5
+  - python3
   except:
   - tags