diff --git a/.github/workflows/dockerised-postgres.yml b/.github/workflows/dockerised-postgres.yml
index 47e0a758..bcd1f38f 100644
--- a/.github/workflows/dockerised-postgres.yml
+++ b/.github/workflows/dockerised-postgres.yml
@@ -49,10 +49,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
       - name: Run test noproc fixture on docker
         uses: fizyk/actions-reuse/.github/actions/pipenv@v3.0.2
         with:
diff --git a/.github/workflows/oldest-postgres.yml b/.github/workflows/oldest-postgres.yml
index 7f964ce2..47cd196a 100644
--- a/.github/workflows/oldest-postgres.yml
+++ b/.github/workflows/oldest-postgres.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Install oldest supported versions
         uses: fizyk/actions-reuse/.github/actions/pipenv-run@v3.1.0
         with:
-          command: pip install -r oldest-requirements.txt
+          command: pip install -r oldest/requirements.txt
       - name: Run tests without xdist
         uses: fizyk/actions-reuse/.github/actions/pipenv-run@v3.1.0
         with:
diff --git a/.github/workflows/single-postgres.yml b/.github/workflows/single-postgres.yml
index ef8fca4d..7e32b4ee 100644
--- a/.github/workflows/single-postgres.yml
+++ b/.github/workflows/single-postgres.yml
@@ -35,8 +35,8 @@ jobs:
       POSTGRES: ${{ inputs.postgresql }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Set up Pipenv on python ${{ matrix.python-version }}
+        uses: fizyk/actions-reuse/.github/actions/pipenv-setup@v3.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - uses: ankane/setup-postgres@v1
@@ -53,14 +53,12 @@ jobs:
         if: ${{ contains(inputs.python-versions, 'pypy') }}
         run: sudo apt install libpq5
       - name: Run test
-        uses: fizyk/actions-reuse/.github/actions/pipenv@v3.0.2
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v3.1.0
         with:
-          python-version: ${{ matrix.python-version }}
           command: py.test -svv -p no:xdist --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml
       - name: Run xdist test
-        uses: fizyk/actions-reuse/.github/actions/pipenv@v3.0.2
+        uses: fizyk/actions-reuse/.github/actions/pipenv-run@v3.1.0
         with:
-          python-version: ${{ matrix.python-version }}
           command: py.test -n auto --dist loadgroup --max-worker-restart 0 --postgresql-exec="/usr/lib/postgresql/${{ inputs.postgresql }}/bin/pg_ctl" -k "not docker" --cov-report=xml:coverage-xdist.xml
       - uses: actions/upload-artifact@v4
         if: failure()
diff --git a/newsfragments/+bda84735.misc.rst b/newsfragments/+bda84735.misc.rst
new file mode 100644
index 00000000..8ecc1b13
--- /dev/null
+++ b/newsfragments/+bda84735.misc.rst
@@ -0,0 +1 @@
+Test pipeline optimisations
diff --git a/oldest-requirements.txt b/oldest/requirements.txt
similarity index 100%
rename from oldest-requirements.txt
rename to oldest/requirements.txt