diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ee4e6f..c5d0aab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,10 +9,10 @@ on:
 jobs:
   build:
     name: Run tests
-    runs-on: macos-latest
+    runs-on: macOS-11.0
     strategy:
       matrix:
-        xcode_version: ["12.4"]
+        xcode_version: ["12.5"]
       fail-fast: false
 
     steps:
@@ -41,7 +41,7 @@ jobs:
     - name: watchOS Tests
       run: |
         set -o pipefail
-        DISABLE_TESTS=true xcodebuild -scheme SwiftJQ -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm' clean build | xcpretty -c
+        xcodebuild -scheme SwiftJQ -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm' clean build | xcpretty -c
     
     - name: tvOS Tests
       run: |
diff --git a/Package.swift b/Package.swift
index a9c0511..cbe2d44 100644
--- a/Package.swift
+++ b/Package.swift
@@ -34,11 +34,3 @@ let package = Package(
             checksum: "c307ff4552ab8e110e3ecaf7bf4823991cc5dd059065b32e1b3daf9d15fe7081"),
     ]
 )
-
-import Foundation
-
-// Temporary workaround so builds on watchOS pass.
-// watchOS will support XCTest with Xcode 12.5.
-if ProcessInfo.processInfo.environment["DISABLE_TESTS"] == "true" {
-    package.targets.removeAll(where: \.isTest)
-}