diff --git a/.github/workflows/build-secondary-platforms.yml b/.github/workflows/build-secondary-platforms.yml
index c45c547dc..dba93c07a 100644
--- a/.github/workflows/build-secondary-platforms.yml
+++ b/.github/workflows/build-secondary-platforms.yml
@@ -2,7 +2,6 @@ name: Secondary Platforms iOS Build
 
 on:
   workflow_dispatch:
-  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
index efbc30e6f..01d1855bb 100644
--- a/.github/workflows/native-tests.yml
+++ b/.github/workflows/native-tests.yml
@@ -18,7 +18,7 @@ jobs:
       max-parallel: 4
       matrix:
         platform: [iOS, tvOS]
-        scheme: [mParticle-Apple-SDK-NoLocation]
+        scheme: [mParticle-Apple-SDK-NoLocation, mParticle-Apple-SDK-Swift]
         include:
           - platform: iOS
             device: iPhone 16 Pro
@@ -29,21 +29,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: ${{ env.XCODE_VERSION }}
-
-      - name: Setup specified simulator
-        uses: futureware-tech/simulator-action@v4
-        id: simulator
-        with:
-          model: ${{ matrix.device }}
-          os: ${{ matrix.platform }}
-          os_version: ">=18.0"
-          erase_before_boot: true
-          wait_for_boot: true
-          shutdown_after_job: true
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app
 
       - name: Run unit tests
-        run: xcodebuild -project mParticle-Apple-SDK.xcodeproj -scheme ${{ matrix.scheme }} -destination 'id=${{ steps.simulator.outputs.UDID }}' test
+        run: xcodebuild -project mParticle-Apple-SDK.xcodeproj -scheme ${{ matrix.scheme }} -destination 'platform=${{ matrix.platform }} Simulator,name=${{ matrix.device }},OS=latest' test
diff --git a/mParticle-Apple-SDK-Swift/Test/Utils/MPDeviceTests.swift b/mParticle-Apple-SDK-Swift/Test/Utils/MPDeviceTests.swift
index 2dc0c88d5..6311899db 100644
--- a/mParticle-Apple-SDK-Swift/Test/Utils/MPDeviceTests.swift
+++ b/mParticle-Apple-SDK-Swift/Test/Utils/MPDeviceTests.swift
@@ -30,6 +30,7 @@ class MPIdentityApiMPDeviceMock: MPIdentityApiMPDeviceProtocol {
     }
 }
 
+@available(iOS 16, tvOS 16, *)
 final class MPDeviceTests: XCTestCase {
 
     func testDictionaryDescription() {