diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
new file mode 100644
index 0000000000..d644736f45
--- /dev/null
+++ b/.github/workflows/samples.yml
@@ -0,0 +1,78 @@
+name: 'Samples'
+# Runs `check` in each build the SDK build doesn't include, so a broken sample or
+# integration test fails its own job instead of the SDK's Build job.
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    name: Check ${{ matrix.name }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: sentry-samples-android
+            path: sentry-samples/sentry-samples-android
+          - name: sentry-android-integration-tests
+            path: sentry-android-integration-tests
+
+    env:
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          submodules: 'recursive'
+
+      - name: Setup Java Version
+        uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
+      - name: Cache buildSrc
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: buildSrc/build
+          key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
+        with:
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
+      - name: Run Tests and Lint
+        run: ./gradlew -p ${{ matrix.path }} check
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
+        with:
+          name: test-results-${{ matrix.name }}
+          path: |
+            **/build/reports/*
+
+      - name: Test Report
+        uses: phoenix-actions/test-reporting@7317eea6e13c47348dd0bb318669485157c518d6 # pin@v16
+        if: always()
+        with:
+          name: JUnit ${{ matrix.name }}
+          list-suites: 'failed'
+          list-tests: 'failed'
+          path: |
+            **/build/test-results/**/*.xml
+          reporter: java-junit
+          output-to: step-summary
+          fail-on-error: false
diff --git a/Makefile b/Makefile
index 1019344a3d..c6cac9609e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical check checkSampleAndroid checkIntegrationTests preMerge publish
+.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical check preMerge publish
 
 all: stop clean javadocs compile
 assembleUiTests: assembleUiTestRelease
-preMerge: check checkSampleAndroid checkIntegrationTests
+preMerge: check
 publish: clean dryRelease
 
 # deep clean
@@ -50,11 +50,3 @@ runUiTestCritical:
 # Run tests and lint
 check:
 	./gradlew check
-
-# The Android sample is a separate build, so the root `check` doesn't reach it
-checkSampleAndroid:
-	./gradlew -p sentry-samples/sentry-samples-android check
-
-# The Android integration tests are a separate build, so the root `check` doesn't reach them
-checkIntegrationTests:
-	./gradlew -p sentry-android-integration-tests check