diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index 7c9c685f8d4..371f0baeb3f 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -24,17 +24,3 @@ runs:
       run: python allTests.py --debug --all --continue --workers=4 --export-xml=test-report.xml ${{ inputs.flags }}
       shell: powershell
       if: runner.os == 'Windows'
-
-    - name: Upload test logs
-      uses: actions/upload-artifact@v4
-      with:
-        name: test-logs-${{ matrix.config }}-${{ matrix.os }}
-        path: ${{ inputs.working_directory }}/**/*.log
-        if-no-files-found: ignore
-      if: always()
-
-    - name: Test Summary
-      uses: test-summary/action@v2
-      with:
-        paths: "${{ inputs.working_directory }}/test-report.xml"
-      if: always()
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 631cb2716a7..bd9bb292fde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Test ${{ matrix.config }} on ${{ matrix.os }}
         uses: ./.github/actions/test
-        timeout-minutes: 90
+        timeout-minutes: 30
         with:
           working_directory: ${{ matrix.working_directory || '.' }}
           # See:
@@ -109,3 +109,17 @@ jobs:
           flags: "--rfilter=IceGrid/replication ${{ matrix.test_flags }}"
         # Don't test matlab on Windows (see setup-dependencies/action.yml)
         if: matrix.config != 'matlab' || runner.os != 'Windows'
+
+      - name: Upload test logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-logs-${{ matrix.config }}-${{ matrix.os }}
+          path: ${{ matrix.working_directory || '.' }}/**/*.log
+          if-no-files-found: ignore
+        if: always()
+
+      # - name: Test Summary
+      #   uses: test-summary/action@v2
+      #   with:
+      #     paths: "${{ matrix.working_directory || '.' }}/test-report.xml"
+      #   if: always()