diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f7b3f008c4677660951f67ca435fbbdf6ed8d14..b6c1ccf8424b3989bef169c63c58b9a4344e2031 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,17 +11,17 @@ Python 2.7 AMD CPU:
   - amd-cl-cpu
   except:
   - tags
-Python 2.6 AMD CPU:
+Python 2.6 POCL:
   script:
   - export PY_EXE=python2.6
-  - export PYOPENCL_TEST=amd:pu
+  - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="numpy mako"
   - export LOOPY_NO_CACHE=1
   - 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.6
-  - amd-cl-cpu
+  - pocl
   except:
   - tags
 Python 3.4 AMD CPU:
@@ -54,7 +54,7 @@ Python 2.7 POCL:
 Python 2.7 with legacy PyOpenCL:
   script:
   - export PY_EXE=python2.7
-  - export PYOPENCL_TEST=amd:pu
+  - export PYOPENCL_TEST=portable
   - export EXTRA_INSTALL="numpy mako"
   - export REQUIREMENTS_TXT="requirements-old-pyopencl.txt"
   - export LOOPY_NO_CACHE=1