diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml
index d0b6dcefde..1f945197d9 100644
--- a/.github/workflows/build-prs.yml
+++ b/.github/workflows/build-prs.yml
@@ -53,9 +53,6 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew assemble checkFormatting
 
-      - name: Test Production Client
-        run: ./gradlew testProductionClient
-
       - name: Run JCC
         if: ${{ ! startsWith(github.event.pull_request.head.ref, 'port/') && ! startsWith(github.ref_name, 'port/') && ! startsWith(github.event.pull_request.base.ref, 'port/') }}
         run: ./gradlew checkJarCompatibility
diff --git a/.github/workflows/test-prs.yml b/.github/workflows/test-prs.yml
index 51afdcddad..7395a8f4e1 100644
--- a/.github/workflows/test-prs.yml
+++ b/.github/workflows/test-prs.yml
@@ -47,6 +47,12 @@ jobs:
       - name: Run JUnit tests with Gradle
         run: ./gradlew :tests:runUnitTests
 
+      - name: Install software OpenGL rendering
+        run: sudo apt-get install xvfb libgl1-mesa-dri
+
+      - name: Run production client
+        run: DRI_PRIME=0 xvfb-run ./gradlew :neoforge:testProductionClient
+
       - name: Store reports
         if: failure()
         uses: actions/upload-artifact@v4