diff --git a/Makefile b/Makefile
index a84fca049bba..70195a0435df 100644
--- a/Makefile
+++ b/Makefile
@@ -48,32 +48,7 @@ xcodebuild:
 		fi;	
 
 xcodebuild-test:
-	if test "$(PLATFORM)" = "iOS"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_IOS)"; \
-		elif test "$(PLATFORM)" = "macOS"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_MACOS)"; \
-		elif test "$(PLATFORM)" = "tvOS"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_TVOS)"; \
-		elif test "$(PLATFORM)" = "watchOS"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_WATCHOS)"; \
-		elif test "$(PLATFORM)" = "visionOS"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_VISIONOS)"; \
-		elif test "$(PLATFORM)" = "macCatalyst"; \
-		then $(XCODEBUILD) \
-			-testPlan "$(TEST_PLAN)" \
-			-destination platform="$(PLATFORM_MAC_CATALYST)"; \
-		else exit 1; \
-		fi;	
+	$(MAKE) xcodebuild -testPlan "$(TEST_PLAN)"
 
 build-for-library-evolution:
 	swift build \
diff --git a/Tests/ComposableArchitectureTests/EffectCancellationTests.swift b/Tests/ComposableArchitectureTests/EffectCancellationTests.swift
index 078b773e7db8..a9fa4b873459 100644
--- a/Tests/ComposableArchitectureTests/EffectCancellationTests.swift
+++ b/Tests/ComposableArchitectureTests/EffectCancellationTests.swift
@@ -11,6 +11,12 @@ final class EffectCancellationTests: BaseTCATestCase {
     self.cancellables.removeAll()
   }
 
+  override func invokeTest() {
+    withMainSerialExecutor {
+      super.invokeTest()
+    }
+  }
+
   func testCancellation() async {
     let values = LockIsolated<[Int]>([])