diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0683b87ba..5d692e7b1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,9 +14,6 @@ on:
       - settings.gradle
 
 jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
@@ -73,3 +70,15 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USER }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASS }}
         continue-on-error: true
+
+      - name: Fabric Game Test
+        uses: Anvil-Dev/dedicated-server-launch-test@1.20.1-fabric
+        with:
+          mod: fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.20.1-84-fabric cloth-config:11.1.136+fabric
+
+      - name: Forge Game Test
+        uses: Anvil-Dev/dedicated-server-launch-test@1.20.1-forge
+        with:
+          mod: forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.20.1-84-forge cloth-config:11.1.136+forge
diff --git a/.github/workflows/gametest.yml b/.github/workflows/gametest.yml
deleted file mode 100644
index e7640c3c1..000000000
--- a/.github/workflows/gametest.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: GameTest for AnvilCraftMod 1.20.1
-on: workflow_call
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Read Properties
-        id: 'properties'
-        uses: christian-draeger/read-properties@1.1.1
-        with:
-          path: gradle.properties
-          properties: 'java_version'
-
-      - name: Setup Java ${{ steps.properties.outputs.java_version }}
-        uses: actions/setup-java@v3.6.0
-        with:
-          distribution: zulu
-          java-version: ${{ steps.properties.outputs.java_version }}
-
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
-
-      - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Run Fabric GameTest
-        run: ./gradlew anvilcraft-fabric:runGameTestServer
-
-      - name: Run Forge GameTest
-        run: ./gradlew anvilcraft-forge:runGameTestServer
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 604394c08..0230731ac 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -14,9 +14,6 @@ on:
       - settings.gradle
 
 jobs:
-  gametest:
-    secrets: inherit
-    uses: ./.github/workflows/gametest.yml
   build:
     runs-on: ubuntu-latest
     env:
@@ -64,4 +61,16 @@ jobs:
           name: "${{ steps.properties.outputs.mod_name }} ${{ steps.version.outputs.version }}"
           path: |
             fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
-            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
\ No newline at end of file
+            forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
+
+      - name: Fabric Game Test
+        uses: Anvil-Dev/dedicated-server-launch-test@1.20.1-fabric
+        with:
+          mod: fabric/build/libs/anvilcraft-fabric-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.20.1-84-fabric cloth-config:11.1.136+fabric
+
+      - name: Forge Game Test
+        uses: Anvil-Dev/dedicated-server-launch-test@1.20.1-forge
+        with:
+          mod: forge/build/libs/anvilcraft-forge-${{ steps.version.outputs.version }}.jar
+          extra-mods: patchouli:1.20.1-84-forge cloth-config:11.1.136+forge