diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b041d2e..8e6e90e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,13 +31,13 @@ jobs:
               fi
           done
   matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
     - id: set-matrix
       run: |
-        BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,')
+        BRANCH_NAME=$(echo ${{ github.base_ref || github.ref }} | sed -e 's,.*/\(.*\),\1,')
         if [[ $BRANCH_NAME = 15.0* ]] ; then
           matrix='{"include": [{
               "container": "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest",
@@ -57,10 +57,10 @@ jobs:
               "name": "test with OCB 17"
             }]}'
         fi
-        echo "matrix<<EOF"$'\n'"$matrix"$'\n'EOF >> $GITHUB_OUTPUT
+        echo "matrix=$matrix" | tr -d '\n' >> $GITHUB_OUTPUT
   test:
     needs: matrix_prep
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container: ${{ matrix.container }}
     name: ${{ matrix.name }}
     permissions:
diff --git a/test-requirements.txt b/test-requirements.txt
index 37d8df5..502e911 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,3 @@
-git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_base
-git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_individual
+git+https://github.com/OpenG2P/rest-framework@17.0#subdirectory=fastapi
+git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_base
+git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=g2p_registry_individual