diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj
index 08495f64d..4413ab136 100644
--- a/Split.xcodeproj/project.pbxproj
+++ b/Split.xcodeproj/project.pbxproj
@@ -4447,9 +4447,9 @@
 			targets = (
 				3B6DEE5920EA6A4E0067435E /* Split */,
 				592C6AA4211B6C99002D120C /* SplitTestsSwift5 */,
+				5B3C16342ED76BAD0068D623 /* SplitTestsSwift6 */,
 				95825B9F271F004700A0CDAD /* Split_Split */,
 				95B02CA328D0BD790030EC8B /* SplitWatchOS */,
-				5B3C16342ED76BAD0068D623 /* SplitTestsSwift6 */,
 			);
 		};
 /* End PBXProject section */
diff --git a/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme b/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme
index ee3a67f59..f999ca50a 100644
--- a/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme
+++ b/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme
@@ -20,20 +20,6 @@
                ReferencedContainer = "container:Split.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "592C6AA4211B6C99002D120C"
-               BuildableName = "SplitTestsSwift5.xctest"
-               BlueprintName = "SplitTestsSwift5"
-               ReferencedContainer = "container:Split.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -104,18 +90,6 @@
             reference = "container:SplitiOSUnit_5.xctestplan">
          </TestPlanReference>
       </TestPlans>
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "592C6AA4211B6C99002D120C"
-               BuildableName = "SplitTestsSwift5.xctest"
-               BlueprintName = "SplitTestsSwift5"
-               ReferencedContainer = "container:Split.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/Split.xcodeproj/xcshareddata/xcschemes/SplitTests Swift6.xcscheme b/Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift5.xcscheme
similarity index 67%
rename from Split.xcodeproj/xcshareddata/xcschemes/SplitTests Swift6.xcscheme
rename to Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift5.xcscheme
index 1067e3bbe..cb441d0f5 100644
--- a/Split.xcodeproj/xcshareddata/xcschemes/SplitTests Swift6.xcscheme	
+++ b/Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift5.xcscheme
@@ -6,13 +6,34 @@
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
       buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "592C6AA4211B6C99002D120C"
+               BuildableName = "SplitTestsSwift5.xctest"
+               BlueprintName = "SplitTestsSwift5"
+               ReferencedContainer = "container:Split.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:SplitiOSFull.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift6.xcscheme b/Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift6.xcscheme
new file mode 100644
index 000000000..c69bfe9f6
--- /dev/null
+++ b/Split.xcodeproj/xcshareddata/xcschemes/SplitTestsSwift6.xcscheme
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5B3C16342ED76BAD0068D623"
+               BuildableName = "SplitTestsSwift6.xctest"
+               BlueprintName = "SplitTestsSwift6"
+               ReferencedContainer = "container:Split.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:SplitiOSFull.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5B26EAA92ECE9ACC007143C5"
+               BuildableName = "SplitTests Swift6.xctest"
+               BlueprintName = "SplitTests Swift6"
+               ReferencedContainer = "container:Split.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/SplitTests/Integration/streaming/WatchOS.xctestplan b/SplitTests/Integration/streaming/WatchOS.xctestplan
index df42bbfff..4d9641346 100644
--- a/SplitTests/Integration/streaming/WatchOS.xctestplan
+++ b/SplitTests/Integration/streaming/WatchOS.xctestplan
@@ -1114,7 +1114,7 @@
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],
diff --git a/SplitiOSFull.xctestplan b/SplitiOSFull.xctestplan
index cb7f2205a..ddb408e9d 100644
--- a/SplitiOSFull.xctestplan
+++ b/SplitiOSFull.xctestplan
@@ -35,11 +35,18 @@
     }
   },
   "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Split.xcodeproj",
+        "identifier" : "5B3C16342ED76BAD0068D623",
+        "name" : "SplitTestsSwift6"
+      }
+    },
     {
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],
diff --git a/SplitiOSHalf_1.xctestplan b/SplitiOSHalf_1.xctestplan
index 13ae32257..d2b4c73aa 100644
--- a/SplitiOSHalf_1.xctestplan
+++ b/SplitiOSHalf_1.xctestplan
@@ -663,7 +663,7 @@
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],
diff --git a/SplitiOSStreaming_2.xctestplan b/SplitiOSStreaming_2.xctestplan
index c950db0f9..d6fbc921b 100644
--- a/SplitiOSStreaming_2.xctestplan
+++ b/SplitiOSStreaming_2.xctestplan
@@ -1138,7 +1138,7 @@
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],
diff --git a/SplitiOSUnit.xctestplan b/SplitiOSUnit.xctestplan
index e7b84c777..b85a7eb02 100644
--- a/SplitiOSUnit.xctestplan
+++ b/SplitiOSUnit.xctestplan
@@ -1144,7 +1144,7 @@
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],
diff --git a/SplitiOSUnit_5.xctestplan b/SplitiOSUnit_5.xctestplan
index 0ff36295c..b196a28c7 100644
--- a/SplitiOSUnit_5.xctestplan
+++ b/SplitiOSUnit_5.xctestplan
@@ -204,7 +204,7 @@
       "target" : {
         "containerPath" : "container:Split.xcodeproj",
         "identifier" : "592C6AA4211B6C99002D120C",
-        "name" : "SplitTests"
+        "name" : "SplitTestsSwift5"
       }
     }
   ],