diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 46c8e050e..f0122f68e 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -1,49 +1,27 @@
 name: CORE Test Suite Validation
 on:
-  workflow_run:
-    workflows: ["Upload PR Artifact"]
-    types: [completed]
   workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "PR number to test (for forked repositories) (leave empty for current branch)"
-        required: false
-        type: string
+  pull_request:
   push:
     branches:
       - main
-
+permissions:
+  contents: read
 env:
   DATASET_SIZE_THRESHOLD: 1000000000
 
 jobs:
   validate:
     runs-on: ubuntu-latest
-    # Only run if the workflow_run was successful or if manually triggered/pushed
-    if: |
-      github.event_name == 'push' || 
-      github.event_name == 'workflow_dispatch' || 
-      github.event.workflow_run.conclusion == 'success'
     steps:
-      - name: Download PR engine artifact
-        if: github.event_name == 'workflow_run'
-        uses: actions/download-artifact@v8
-        with:
-          name: pr-engine-${{ github.event.workflow_run.pull_requests[0].number }}
-
-      - name: Checkout current branch (for push/manual)
-        if: github.event_name != 'workflow_run'
+      - name: Get Engine Changes
         uses: actions/checkout@v6
-        with:
-          ref: ${{ (inputs.pr_number && format('refs/pull/{0}/head', inputs.pr_number)) || github.ref }}
-
       - name: Get Test Suite Repository
         uses: actions/checkout@v6
         with:
           repository: cdisc-org/CORE_Test_Suite
           path: CORE_Test_Suite
           token: ${{ secrets.ACCESS_TOKEN }}
-
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
diff --git a/.github/workflows/upload-pr-artifact.yml b/.github/workflows/upload-pr-artifact.yml
deleted file mode 100644
index 69ea21610..000000000
--- a/.github/workflows/upload-pr-artifact.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Upload PR Artifact
-on:
-  pull_request:
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  build-engine:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout PR code
-        uses: actions/checkout@v6
-
-      - name: Upload engine artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: pr-engine-${{ github.event.pull_request.number }}
-          path: .
-          retention-days: 1