diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1415d8a54..f91ddbbea 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -8,13 +8,6 @@ on:
     types: [synchronize]
 
 jobs:
-  test:
-    name: Test trigger
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'develop'
-    steps:
-      - name: Echo
-        run: echo 'Triggered'
   build:
     name: Build .Net
     runs-on: windows-latest
@@ -81,7 +74,6 @@ jobs:
 
       - name: Test
         run: dotnet test --no-restore --verbosity normal
-
   version:
     name: Bump version on Develop/Canary push
     needs: [ build ]
@@ -244,7 +236,7 @@ jobs:
     permissions:
       packages: write
       contents: read
-    if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/main') }}
+    if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'develop'
     steps:
 
       - name: Find Current Pull Request
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 7482deb0b..9a63e085e 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -8,6 +8,13 @@ on:
         types: [synchronize]
 
 jobs:
+    test:
+      name: Test trigger
+      runs-on: ubuntu-latest
+      if: github.event_name == 'pull_request' && startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.base.ref == 'develop'
+      steps:
+        - name: Echo
+          run: echo 'Triggered'
     check_pr:
         runs-on: ubuntu-latest
         steps: