diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a34b0598935eb90b3e51ba9c32d42a1e1a06dda..e5a5b44af2e1ca3a17a046218407856d7bce759b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,8 @@
-"Python 2.7 AMD CPU (+GL and special func)":
+"Python 2.7 AMD CPU":
   script:
   - export PY_EXE=python2.7
   - export PYOPENCL_TEST=amd:pu
-  - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib"
-  - echo "CL_ENABLE_GL = True" > siteconf.py
+  - 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
@@ -139,6 +138,20 @@ Python 3.6 POCL:
   except:
   - tags
 
+Python 3.6 POCL (+GL and special functions):
+  script:
+  - export PY_EXE=python3.6
+  - export PYOPENCL_TEST=portable
+  - export EXTRA_INSTALL="pybind11 numpy mako scipy pyfmmlib"
+  - echo "CL_ENABLE_GL = True" > siteconf.py
+  - 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.6
+  - pocl
+  except:
+  - tags
+
 Python 2.7 Apple:
   script:
   - export PY_EXE=python2.7