diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d946ecac37f0860247ec00287635cd72d3783da5..7d9dd37b735db7bb7733f0d2949b1ce79534994d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ Python 3.6 AMD CPU:
   except:
   - tags
 
-Python 3.5 Titan X:
+Python 3.6 Titan X:
   script:
   - export PY_EXE=python3.5
   - export PYOPENCL_TEST=nvi:titan
@@ -50,34 +50,34 @@ Python 3.5 Titan X:
   - 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
   - nvidia-titan-x
   except:
   - tags
 
-Python 3.5 K40:
+Python 3.6 K40:
   script:
-  - export PY_EXE=python3.5
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST=nvi:k40
   - export EXTRA_INSTALL="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.5
+  - python3.6
   - nvidia-k40
   except:
   - tags
 
-Python 3.5 AMD GPU:
+Python 3.6 AMD GPU:
   script:
-  - export PY_EXE=python3.5
+  - export PY_EXE=python3.6
   - export PYOPENCL_TEST=amd:fiji
   - export EXTRA_INSTALL="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
   tags:
-  - python3.5
+  - python3.6
   - amd-fiji
   except:
   - tags
@@ -108,7 +108,20 @@ Python 2.7 POCL:
   except:
   - tags
 
-Python 3.5 POCL CL 1.1:
+Python 3.7 POCL:
+  script:
+  - export PY_EXE=python3.7
+  - export PYOPENCL_TEST=portable
+  - export EXTRA_INSTALL="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.7
+  - pocl
+  except:
+  - tags
+
+Python 3.6 POCL CL 1.1:
   script:
   - export PY_EXE=python3.5
   - export PYOPENCL_TEST=portable
@@ -117,7 +130,7 @@ Python 3.5 POCL CL 1.1:
   - echo "CL_PRETEND_VERSION = '1.1'" > siteconf.py
   - ". ./build-and-test-py-project.sh"
   tags:
-  - python3.5
+  - python3.6
   - pocl
   except:
   - tags
@@ -149,7 +162,7 @@ Python 2.7 Apple:
   except:
   - tags
 
-Python 3.5 Conda Apple:
+Python 3 Conda Apple:
   script:
   - 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
diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index b7a4c0cdc3d7899428c09fc099d7cb4487d92523..a149bbe4cb8008125d3fe2a7dc029445b66a6ab4 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -1,8 +1,8 @@
 name: test-conda-env-py3
 channels:
-- inducer
 - conda-forge
 - defaults
+
 dependencies:
 - git
 - conda-forge::numpy