diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 635fea49..e6ed7ea2 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -27,7 +27,8 @@ jobs:
     name: Build for CodeQL & Swift 5.7
     uses: ./.github/workflows/xcodebuild-or-fastlane.yml
     with:
-      runsonlabels: '["macos-12"]'
+      runsonlabels: '["macos-13"]'
+      xcodeversion: 14.2.0
       scheme: Spezi-Package
       test: false
   buildandtestuitests:
diff --git a/Tests/SpeziTests/DataStorageProviderTests/DataStorageProviderTests.swift b/Tests/SpeziTests/DataStorageProviderTests/DataStorageProviderTests.swift
index 34315888..5b791a89 100644
--- a/Tests/SpeziTests/DataStorageProviderTests/DataStorageProviderTests.swift
+++ b/Tests/SpeziTests/DataStorageProviderTests/DataStorageProviderTests.swift
@@ -145,7 +145,12 @@ final class DataStorageProviderTests: XCTestCase {
             }
         )
         
+        #if swift(>=5.8)
         await fulfillment(of: [expectation], timeout: 1)
+        #else
+        wait(for: [expectation], timeout: 1)
+        #endif
+        
         XCTAssertEqual(count, 4)
     }
     
diff --git a/Tests/SpeziTests/StandardTests/StandardTests.swift b/Tests/SpeziTests/StandardTests/StandardTests.swift
index 17f8c420..59e5320c 100644
--- a/Tests/SpeziTests/StandardTests/StandardTests.swift
+++ b/Tests/SpeziTests/StandardTests/StandardTests.swift
@@ -59,7 +59,11 @@ final class StandardTests: XCTestCase {
         )
         _ = await standardInjectionTestApplicationDelegate.spezi
         
+        #if swift(>=5.8)
         await fulfillment(of: [expectation], timeout: 0.01)
+        #else
+        wait(for: [expectation], timeout: 0.01)
+        #endif
     }
     
     func testInjectionPrecondition() throws {