diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 411d932529af2b8ac7b3c2175dad8fbd9b2caac1..7fb4f2dbb62bd2cfd657e3b99599d87985682367 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,25 @@
-Python 2.7 Intel CPU:
+Python 3.5 Titan Black:
   script:
   - py_version=2.7
-  - export PYOPENCL_TEST=int:pu
+  - export PYOPENCL_TEST=nvi:titan
   - EXTRA_INSTALL="numpy mako"
   - 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:
-  - python2.7
-  - intel-cl-cpu
+  - python3.5
+  - nvidia-titan-black
+  except:
+  - tags
+Python 3.5 K40:
+  script:
+  - export PY_EXE=python3.5
+  - export PYOPENCL_TEST=nvi:k40
+  - export EXTRA_INSTALL="numpy mako"
+  - 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.5
+  - nvidia-k40
   except:
   - tags
 Python 2.7 POCL: