diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb7d72bd7d37fd04c0ec88f4a01bb2116a08b613..ccc026fb2cab658fe178fe4f7dd867a91adf4114 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,49 +14,41 @@ Python 2.7 POCL:
         reports:
             junit: test/pytest.xml
 
-Python 3 Titan V:
+Python 3 POCL Titan V:
     script:
-    - export PY_EXE=python3
-    - export PYOPENCL_TEST=nvi:titan
-    - EXTRA_INSTALL="pybind11 numpy mako matplotlib"
-    - 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"
+    - export PYOPENCL_TEST=portable:titan
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
     tags:
-    - python3
     - nvidia-titan-v
-    allow_failure: true
     except:
     - tags
     artifacts:
         reports:
             junit: test/pytest.xml
 
-#Python 3 Titan X:
-#    script:
-#    - export PY_EXE=python3
-#    - export PYOPENCL_TEST=nvi:titan
-#    - EXTRA_INSTALL="pybind11 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
-#    - nvidia-titan-x
-#    except:
-#    - tags
-#    artifacts:
-#        reports:
-#            junit: test/pytest.xml
+Python 3 POCL Titan X:
+    script:
+    - export PYOPENCL_TEST=portable:titan
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
+    tags:
+    - nvidia-titan-x
+    except:
+    - tags
+    artifacts:
+        reports:
+            junit: test/pytest.xml
 
-Python 3 K40:
+Python 3 POCL K40:
     script:
-    - export PY_EXE=python3
-    - export PYOPENCL_TEST=nvi:k40
-    - export EXTRA_INSTALL="pybind11 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"
-    allow_failure: true
+    - export PYOPENCL_TEST=portable:k40
+    - CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+    - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+    - ". ./build-and-test-py-project-within-miniconda.sh"
     tags:
-    - python3
     - nvidia-k40
     except:
     - tags
diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index 19c340f60be941c358fe6b4f3b68907d9e7fb6bb..4f85d4e58f9425403fc2ced505bd7a2d74ee980a 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -8,6 +8,7 @@ dependencies:
 - git
 - numpy
 - pocl
+- pocl-cuda
 - mako
 - pyopencl
 - islpy