diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 599dfc19..55df7cc0 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -13,27 +13,37 @@ concurrency:
 
 jobs:
   tests:
-    name: Test
+    strategy:
+      fail-fast: false
+      matrix:
+        buildSystem: ["native", "swiftbuild"]
+        linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
+        exclude:
+          - buildSystem: "swiftbuild"
+            linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
+          - buildSystem: "native"
+            linuxSwiftVersion: '["nightly-main"]'
+    name: Test (${{ matrix.buildSystem }})
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
       linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
       linux_pre_build_command: ./.github/scripts/prebuild.sh
-      linux_build_command: 'swift test --no-parallel'
-      linux_swift_versions: '["nightly-main", "nightly-6.2"]'
+      linux_build_command: 'swift test --no-parallel --build-system ${{ matrix.buildSystem }}'
+      linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
       windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
       windows_swift_versions: '["nightly-main"]'
-      windows_build_command: 'Invoke-Program swift test --no-parallel'
+      windows_build_command: 'Invoke-Program swift test --no-parallel  --build-system ${{ matrix.buildSystem }}'
       enable_linux_static_sdk_build: true
       enable_android_sdk_build: true
-      android_sdk_build_command: "swift build --build-tests"
+      android_sdk_build_command: "swift build --build-tests --build-system ${{ matrix.buildSystem }}"
       android_ndk_versions: '["r27d", "r29"]'
-      linux_static_sdk_build_command: SWIFTBUILD_STATIC_LINK=1 LLBUILD_STATIC_LINK=1 swift build
+      linux_static_sdk_build_command: SWIFTBUILD_STATIC_LINK=1 LLBUILD_STATIC_LINK=1 swift build --build-system ${{ matrix.buildSystem }}
       enable_ios_checks: true
       enable_macos_checks: true
       macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
       macos_pre_build_command: ./.github/scripts/prebuild.sh
       macos_build_command:
-        swift test &&
+        swift test --build-system ${{ matrix.buildSystem }} &&
         /usr/bin/xcrun xcodebuild -workspace . -scheme SwiftBuild-Package -destination generic/platform=iOS
   cmake-smoke-test:
     name: cmake-smoke-test