diff --git a/.test-conda-env-py2.yml b/.test-conda-env-py2.yml
deleted file mode 100644
index a8f559e29e0250ed5011df898a91ac7b114df740..0000000000000000000000000000000000000000
--- a/.test-conda-env-py2.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: test-conda-env-py2
-channels:
-- conda-forge
-- defaults
-
-dependencies:
-- python=2.7
-- git
-- conda-forge::numpy
-- pocl
-- mako
-- pybind11
diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index 806454fa0ce7a15ea080ed265546f73ffb723aab..c3680c93a813507fa085855e2bf64ce9ebbba60b 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -1,9 +1,10 @@
-name: test-conda-env-py3
+name: test-conda-env
 channels:
 - conda-forge
 - defaults
 
 dependencies:
+- python=3
 - git
 - conda-forge::numpy
 - pocl
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8990da38efd903076c420745015769967433305d..b790c3b43feb76f66d376d041ab31a496e9de376 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,6 +8,7 @@ jobs:
     -
         script: |
             set -e
+            sed 's/python=3/python<3/' .test-conda-env-py3.yml > .test-conda-env-py2.yml
             CONDA_ENVIRONMENT=.test-conda-env-py2.yml
             curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
             . ./build-and-test-py-project-within-miniconda.sh