diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f9acaf86497c05d29b037a149184a7d87c23ab1..3762198807754650db358189a692980d4ee3d6d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,9 @@ Python 2.7 K40:
   except:
   - tags
 
-Python 3.6 Titan X:
+Python 3 Titan X:
   script:
-  - py_version=3.6
+  - py_version=3
   - EXTRA_INSTALL="numpy mako"
   - export PYCUDA_DEFAULT_NVCC_FLAGS="-ccbin g++-7"
   - echo "CUDADRV_LIB_DIR = ['/usr/lib/x86_64-linux-gnu/nvidia/current']" > siteconf.py
@@ -38,14 +38,14 @@ Python 3.6 Titan X:
   - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.6
+  - python3
   - nvidia-titan-x
   except:
   - tags
 
-Python 3.6 Titan V:
+Python 3 Titan V:
   script:
-  - py_version=3.6
+  - py_version=3
   - EXTRA_INSTALL="numpy mako"
   - export PYCUDA_DEFAULT_NVCC_FLAGS="-ccbin g++-7"
   - echo "CUDADRV_LIB_DIR = ['/usr/lib/x86_64-linux-gnu/nvidia/current']" > siteconf.py
@@ -53,14 +53,14 @@ Python 3.6 Titan V:
   - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.6
+  - python3
   - nvidia-titan-v
   except:
   - tags
 
-Python 3.6 K40:
+Python 3 K40:
   script:
-  - py_version=3.6
+  - py_version=3
   - EXTRA_INSTALL="numpy mako"
   - export PYCUDA_DEFAULT_NVCC_FLAGS="-ccbin g++-7"
   - echo "CUDADRV_LIB_DIR = ['/usr/lib/x86_64-linux-gnu/nvidia/current']" > siteconf.py
@@ -68,22 +68,7 @@ Python 3.6 K40:
   - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.6
-  - nvidia-k40
-  except:
-  - tags
-
-Python 3.7 K40:
-  script:
-  - py_version=3.7
-  - EXTRA_INSTALL="numpy mako"
-  - export PYCUDA_DEFAULT_NVCC_FLAGS="-ccbin g++-7"
-  - echo "CUDADRV_LIB_DIR = ['/usr/lib/x86_64-linux-gnu/nvidia/current']" > siteconf.py
-  - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh
-  - "export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
-  - ". ./build-and-test-py-project.sh"
-  tags:
-  - python3.7
+  - python3
   - nvidia-k40
   except:
   - tags
@@ -94,7 +79,7 @@ Documentation:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
   - ". ./build-docs.sh"
   tags:
-  - python3.5
+  - python3
   - nvidia-titan-x
   only:
   - master