diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index d47cf385ced9..85eb46898973 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -17,4 +17,20 @@ jobs:
       - name: Set +x
         run: chmod a+x gradlew
       - name: Build and test
-        run: ./gradlew clean assembleDebug test
\ No newline at end of file
+        run: ./gradlew clean assembleDebug test
+      - name: Collate tests
+        if: ${{ true }}
+        run: |
+          mkdir -p build/test_results
+          find . -regextype posix-extended -regex '.*reports/tests/([^/]+?)' -exec cp -r {} build/test_results/ \;
+      - name: Upload test results
+        if: ${{ true }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: build/test_results
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-debug
+          path: TeamCode/build/outputs/apk/debug/TeamCode-debug.apk