diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed2482578ae4bbb3d91d7c71c38416f5e8d90f08..316f551390c5bfe638a8380376f6d71eb6dd9ab1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -153,7 +153,7 @@ Python 3.7 POCL:
 
 Python 3.6 POCL CL 1.1:
   script:
-  - export PY_EXE=python3.5
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST=portable
   - 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
@@ -259,7 +259,7 @@ Documentation:
   - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh
   - ". ./build-docs.sh"
   tags:
-  - python3.5
+  - linux
   only:
   - master