diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index c18ca69fde..5cc8882e20 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -66,11 +66,16 @@ jobs:
             ${{ runner.os }}-gradle-
       - name: Start synapse server
         run: |
-          python3 -m venv .synapse
-          source .synapse/bin/activate
-          pip install synapse matrix-synapse
-          curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh --no-rate-limit \
-            | sed s/127.0.0.1/0.0.0.0/g | bash
+          git clone -b develop https://github.com/matrix-org/synapse.git
+          cd synapse
+          source env/bin/activate
+          pip install -e .
+          demo/start.sh --no-rate-limit
+#          python3 -m venv .synapse
+#          source .synapse/bin/activate
+#          pip install synapse matrix-synapse
+#          curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh --no-rate-limit \
+#            | sed s/127.0.0.1/0.0.0.0/g | bash
       - name: Run integration tests on API ${{ matrix.api-level }}
         uses: reactivecircus/android-emulator-runner@v2
         with:
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 3fb6b81505..d84f886896 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -47,7 +47,7 @@ android {
 
     testOptions {
         // Comment to run on Android 12
-        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+//        execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
 
     buildTypes {
diff --git a/vector/build.gradle b/vector/build.gradle
index 4a26717782..a720b5f988 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -205,7 +205,7 @@ android {
         animationsDisabled = true
 
         // Comment to run on Android 12
-        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+//        execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
 
     signingConfigs {