diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a7a57ecafd172ab4ed0149300ea385fc10bccb7..ef10883e0143a36949be0c44752916367de83c1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,14 +26,14 @@ Python 2.7 Conda:
     reports:
       junit: test/pytest.xml
 
-Python 3.5:
+Python 3.6:
   script:
-  - py_version=3.5
+  - py_version=3.6
   - EXTRA_INSTALL="numpy sympy pexpect"
   - 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
+  - python3.6
   - maxima
   except:
   - tags
@@ -73,7 +73,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