diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 57897618..2af2be77 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -116,11 +116,7 @@ jobs:
           ram-size: 4096M
           emulator-options: -no-window -no-snapshot-save -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: |
-            ./scripts/install_test_apks.sh
-            ./scripts/run_instrumented_tests.sh dpadrecyclerview
-            ./scripts/run_instrumented_tests.sh dpadrecyclerview-testing
-            ./scripts/run_instrumented_tests.sh dpadrecyclerview-compose
-            ./scripts/run_instrumented_tests.sh sample
+            ./gradlew --build-cache connectedDebugAndroidTest
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle
index 1824dc0d..7b00b90e 100644
--- a/dpadrecyclerview-compose/build.gradle
+++ b/dpadrecyclerview-compose/build.gradle
@@ -15,6 +15,7 @@ android {
         targetSdk versions.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments additionalTestOutputDir: 'storage/emulated/0/recordings/com.rubensousa.dpadrecyclerview.compose.test'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
     }
 
diff --git a/dpadrecyclerview-testing/build.gradle b/dpadrecyclerview-testing/build.gradle
index b9ed4454..4acad5bb 100644
--- a/dpadrecyclerview-testing/build.gradle
+++ b/dpadrecyclerview-testing/build.gradle
@@ -15,6 +15,7 @@ android {
         targetSdk versions.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments additionalTestOutputDir: 'storage/emulated/0/recordings/com.rubensousa.dpadrecyclerview.testing.test'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
         multiDexEnabled true
     }
diff --git a/dpadrecyclerview/build.gradle b/dpadrecyclerview/build.gradle
index 3966bfcb..4564e14d 100644
--- a/dpadrecyclerview/build.gradle
+++ b/dpadrecyclerview/build.gradle
@@ -15,6 +15,7 @@ android {
         targetSdk versions.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments additionalTestOutputDir: 'storage/emulated/0/recordings/com.rubensousa.dpadrecyclerview.test'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
     }