diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d0481192817877edea3b8deaaaf86b480fab2a11..0c6226d795118fe85488e4d1e4f8793d4e54e77a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         -
             uses: actions/setup-python@v1
             with:
-                python-version: '3.x' 
+                python-version: '3.x'
         -   name: "Main Script"
             run: |
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh
@@ -56,8 +56,10 @@ jobs:
         -   name: "Main Script"
             run: |
                 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
-                . ./build-and-test-py-project-within-miniconda.sh
-                ${PY_EXE} -m pytest -rw --durations=10 --tb=native  --junitxml=pytest.xml -rxs $TESTABLES
+                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+                . ./ci-support.sh
+                build_py_project_in_conda_env
+                ( test_py_project )
+                ( test_py_project )
 
 # vim: sw=4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48bee8638df08ebe8c03a17f84c78851ff36466e..ad7b1ab8dacb6245dbbfc661089742d3d1e9e0d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,15 +36,15 @@ Python 3 Intel:
 
 
 Python 3 POCL Twice With Cache:
-  script:
-  - export PY_EXE=python3
-  - export PYOPENCL_TEST=portable:pthread
-  - 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"
-  - "cd .."
-  - 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"
+  script: |
+    export PY_EXE=python3
+    export PYOPENCL_TEST=portable:pthread
+    export EXTRA_INSTALL="pybind11 numpy mako"
+    curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+    . ./ci-support.sh
+    build_py_project_in_venv
+    ( test_py_project )
+    ( test_py_project )
   tags:
   - python3
   - pocl
diff --git a/requirements.txt b/requirements.txt
index cd9b67cf4e0e744668b3ef0ae2f2b494d9c2c6e0..2105aede063c65752ef4a9262eb960f749778a8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
-git+https://github.com/inducer/pytools.git
-git+https://github.com/inducer/islpy.git
-git+https://github.com/inducer/cgen.git
-git+https://github.com/inducer/pyopencl.git
-git+https://github.com/inducer/pymbolic.git
-git+https://github.com/inducer/genpy.git
-git+https://github.com/inducer/codepy.git
+git+https://github.com/inducer/pytools.git#egg=pytools
+git+https://github.com/inducer/islpy.git#egg=islpy
+git+https://github.com/inducer/cgen.git#egg=cgen
+git+https://github.com/inducer/pyopencl.git#egg=pyopencl
+git+https://github.com/inducer/pymbolic.git#egg=pymbolic
+git+https://github.com/inducer/genpy.git#egg=genpy
+git+https://github.com/inducer/codepy.git#egg=codepy
 
 git+https://github.com/inducer/f2py