diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
index 0656a5331e..93d007b15b 100644
--- a/.github/workflows/system-tests-backend.yml
+++ b/.github/workflows/system-tests-backend.yml
@@ -101,7 +101,7 @@ jobs:
 
       - name: Start server and run integration test for sentry-cli commands
         run: |
-          test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}"
+          test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}" "0"
 
       - name: Upload test results
         if: always()
diff --git a/test/system-test-run-all.sh b/test/system-test-run-all.sh
index e65a500b4d..cc3fb52367 100755
--- a/test/system-test-run-all.sh
+++ b/test/system-test-run-all.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-./test/system-test-run.sh "sentry-samples-spring-boot" "0" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry-noagent" "0" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry" "1" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry" "1" "false"
-./test/system-test-run.sh "sentry-samples-spring-boot-webflux-jakarta" "0" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-webflux" "0" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" "0" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry" "1" "true"
-./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry" "1" "false"
+./test/system-test-run.sh "sentry-samples-spring-boot" "0" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry-noagent" "0" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry" "1" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-opentelemetry" "1" "false" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-webflux-jakarta" "0" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-webflux" "0" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" "0" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry" "1" "true" "0"
+./test/system-test-run.sh "sentry-samples-spring-boot-jakarta-opentelemetry" "1" "false" "0"
diff --git a/test/system-test-run.sh b/test/system-test-run.sh
index 7f1b47bed4..9560beb363 100755
--- a/test/system-test-run.sh
+++ b/test/system-test-run.sh
@@ -3,6 +3,12 @@
 readonly SAMPLE_MODULE=$1
 readonly JAVA_AGENT=$2
 readonly JAVA_AGENT_AUTO_INIT=$3
+readonly BUILD_BEFORE_RUN=$4
+
+if [[ "$BUILD_BEFORE_RUN" == "1" ]]; then
+  echo "Building before Test run"
+  ./gradlew :sentry-samples:${SAMPLE_MODULE}:assemble
+fi
 
 test/system-test-sentry-server-start.sh
 MOCK_SERVER_PID=$(cat sentry-mock-server.pid)