diff --git a/Samples/EmceeSample/EmceeSample.xcodeproj/project.pbxproj b/Samples/EmceeSample/EmceeSample.xcodeproj/project.pbxproj
index 1eb87e956..e8a028f4f 100644
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/project.pbxproj
+++ b/Samples/EmceeSample/EmceeSample.xcodeproj/project.pbxproj
@@ -36,6 +36,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		4F2DE1442C49695800966298 /* EmceeSampleHostedTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = EmceeSampleHostedTests.xctestplan; sourceTree = "<group>"; };
+		4F2DE1452C4969B400966298 /* EmceeSampleUITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = EmceeSampleUITests.xctestplan; sourceTree = "<group>"; };
+		4F2DE1462C4969EE00966298 /* EmceeSampleTestsWithoutHost.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = EmceeSampleTestsWithoutHost.xctestplan; sourceTree = "<group>"; };
+		4F2DE1472C4970FB00966298 /* AllTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AllTests.xctestplan; sourceTree = "<group>"; };
 		BC06A71527664E620062F39A /* EmceeSampleTestsWithoutHost.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EmceeSampleTestsWithoutHost.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		BC06A71727664E620062F39A /* EmceeSampleTestsWithoutHost.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmceeSampleTestsWithoutHost.swift; sourceTree = "<group>"; };
 		BC584C462753FD7E00B8B9A6 /* EmceeSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = EmceeSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -117,6 +121,10 @@
 		BC584C482753FD7E00B8B9A6 /* EmceeSample */ = {
 			isa = PBXGroup;
 			children = (
+				4F2DE1472C4970FB00966298 /* AllTests.xctestplan */,
+				4F2DE1442C49695800966298 /* EmceeSampleHostedTests.xctestplan */,
+				4F2DE1452C4969B400966298 /* EmceeSampleUITests.xctestplan */,
+				4F2DE1462C4969EE00966298 /* EmceeSampleTestsWithoutHost.xctestplan */,
 				BC584C492753FD7E00B8B9A6 /* AppDelegate.swift */,
 				BC584C4B2753FD7E00B8B9A6 /* SceneDelegate.swift */,
 				BC584C4D2753FD7E00B8B9A6 /* ViewController.swift */,
@@ -534,7 +542,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = D9D392WLFZ;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = EmceeSample/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -564,7 +572,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = D9D392WLFZ;
+				DEVELOPMENT_TEAM = "";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = EmceeSample/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
diff --git a/Samples/EmceeSample/EmceeSample.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Samples/EmceeSample/EmceeSample.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 000000000..0c67376eb
--- /dev/null
+++ b/Samples/EmceeSample/EmceeSample.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
deleted file mode 100644
index 744819204..000000000
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC06A71427664E620062F39A"
-               BuildableName = "EmceeSampleTestsWithoutHost.xctest"
-               BlueprintName = "EmceeSampleTestsWithoutHost"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C652753FD8000B8B9A6"
-               BuildableName = "EmceeSampleUITests.xctest"
-               BlueprintName = "EmceeSampleUITests"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C5B2753FD8000B8B9A6"
-               BuildableName = "EmceeSampleHostedTests.xctest"
-               BlueprintName = "EmceeSampleHostedTests"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C452753FD7E00B8B9A6"
-               BuildableName = "EmceeSample.app"
-               BlueprintName = "EmceeSample"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C5B2753FD8000B8B9A6"
-               BuildableName = "EmceeSampleHostedTests.xctest"
-               BlueprintName = "EmceeSampleHostedTests"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC06A71427664E620062F39A"
-               BuildableName = "EmceeSampleTestsWithoutHost.xctest"
-               BlueprintName = "EmceeSampleTestsWithoutHost"
-               ReferencedContainer = "container:EmceeSample.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C652753FD8000B8B9A6"
-               BuildableName = "EmceeSampleUITests.xctest"
-               BlueprintName = "EmceeSampleUITests"
-               ReferencedContainer = "container:EmceeSample.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">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "BC06A71427664E620062F39A"
-            BuildableName = "EmceeSampleTestsWithoutHost.xctest"
-            BlueprintName = "EmceeSampleTestsWithoutHost"
-            ReferencedContainer = "container:EmceeSample.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSample.xcscheme b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSample.xcscheme
index 3076a855e..e1129708b 100644
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSample.xcscheme
+++ b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSample.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1300"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -27,6 +27,21 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:EmceeSample/EmceeSampleHostedTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+         <TestPlanReference
+            reference = "container:EmceeSample/EmceeSampleUITests.xctestplan">
+         </TestPlanReference>
+         <TestPlanReference
+            reference = "container:EmceeSample/EmceeSampleTestsWithoutHost.xctestplan">
+         </TestPlanReference>
+         <TestPlanReference
+            reference = "container:EmceeSample/AllTests.xctestplan">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTests.xcscheme b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTests.xcscheme
deleted file mode 100644
index d1327fd1a..000000000
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTests.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C5B2753FD8000B8B9A6"
-               BuildableName = "EmceeSampleHostedTests.xctest"
-               BlueprintName = "EmceeSampleHostedTests"
-               ReferencedContainer = "container:EmceeSample.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/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTestsWithoutHost.xcscheme b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTestsWithoutHost.xcscheme
deleted file mode 100644
index c96ef8e94..000000000
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleTestsWithoutHost.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC06A71427664E620062F39A"
-               BuildableName = "EmceeSampleTestsWithoutHost.xctest"
-               BlueprintName = "EmceeSampleTestsWithoutHost"
-               ReferencedContainer = "container:EmceeSample.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/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleUITests.xcscheme b/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleUITests.xcscheme
deleted file mode 100644
index 657956f79..000000000
--- a/Samples/EmceeSample/EmceeSample.xcodeproj/xcshareddata/xcschemes/EmceeSampleUITests.xcscheme
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1300"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "BC584C652753FD8000B8B9A6"
-               BuildableName = "EmceeSampleUITests.xctest"
-               BlueprintName = "EmceeSampleUITests"
-               ReferencedContainer = "container:EmceeSample.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/Samples/EmceeSample/EmceeSample/AllTests.xctestplan b/Samples/EmceeSample/EmceeSample/AllTests.xctestplan
new file mode 100644
index 000000000..8a1ad82af
--- /dev/null
+++ b/Samples/EmceeSample/EmceeSample/AllTests.xctestplan
@@ -0,0 +1,38 @@
+{
+  "configurations" : [
+    {
+      "id" : "5DF03AA0-AB94-4732-BE49-BC6E34C0E5AC",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC584C5B2753FD8000B8B9A6",
+        "name" : "EmceeSampleHostedTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC06A71427664E620062F39A",
+        "name" : "EmceeSampleTestsWithoutHost"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC584C652753FD8000B8B9A6",
+        "name" : "EmceeSampleUITests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Samples/EmceeSample/EmceeSample/EmceeSampleHostedTests.xctestplan b/Samples/EmceeSample/EmceeSample/EmceeSampleHostedTests.xctestplan
new file mode 100644
index 000000000..db5902654
--- /dev/null
+++ b/Samples/EmceeSample/EmceeSample/EmceeSampleHostedTests.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "18B80944-C447-4B9B-9796-6EE99EFC1EC2",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC584C5B2753FD8000B8B9A6",
+        "name" : "EmceeSampleHostedTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Samples/EmceeSample/EmceeSample/EmceeSampleTestsWithoutHost.xctestplan b/Samples/EmceeSample/EmceeSample/EmceeSampleTestsWithoutHost.xctestplan
new file mode 100644
index 000000000..165340532
--- /dev/null
+++ b/Samples/EmceeSample/EmceeSample/EmceeSampleTestsWithoutHost.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "005CA4DC-226F-4461-9441-DE3158D01DEC",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC06A71427664E620062F39A",
+        "name" : "EmceeSampleTestsWithoutHost"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Samples/EmceeSample/EmceeSample/EmceeSampleUITests.xctestplan b/Samples/EmceeSample/EmceeSample/EmceeSampleUITests.xctestplan
new file mode 100644
index 000000000..e433c51ab
--- /dev/null
+++ b/Samples/EmceeSample/EmceeSample/EmceeSampleUITests.xctestplan
@@ -0,0 +1,29 @@
+{
+  "configurations" : [
+    {
+      "id" : "35E1C803-670A-408C-93D4-94A542C13B06",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false,
+    "defaultTestExecutionTimeAllowance" : 1200,
+    "maximumTestExecutionTimeAllowance" : 2400,
+    "maximumTestRepetitions" : 23,
+    "testRepetitionMode" : "retryOnFailure",
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:EmceeSample.xcodeproj",
+        "identifier" : "BC584C652753FD8000B8B9A6",
+        "name" : "EmceeSampleUITests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Samples/EmceeSample/EmceeSampleTestsWithHost/EmceeSampleTestsWithHost.swift b/Samples/EmceeSample/EmceeSampleTestsWithHost/EmceeSampleTestsWithHost.swift
index c078fe698..536a6bc0d 100644
--- a/Samples/EmceeSample/EmceeSampleTestsWithHost/EmceeSampleTestsWithHost.swift
+++ b/Samples/EmceeSample/EmceeSampleTestsWithHost/EmceeSampleTestsWithHost.swift
@@ -18,5 +18,8 @@ class EmceeSampleTestsWithHost: XCTestCase {
     func test___from_tests_with_host___that_always_fails() {
         ViewController().raiseException()
     }
-
+    
+    func test___from_tests_with_host___skipped() throws {
+        throw XCTSkip("Skipping this test")
+    }
 }
diff --git a/Samples/EmceeSample/EmceeSampleUITests/EmceeSampleUITests.swift b/Samples/EmceeSample/EmceeSampleUITests/EmceeSampleUITests.swift
index dd7fa1e5f..0425fc8b4 100644
--- a/Samples/EmceeSample/EmceeSampleUITests/EmceeSampleUITests.swift
+++ b/Samples/EmceeSample/EmceeSampleUITests/EmceeSampleUITests.swift
@@ -38,4 +38,12 @@ class EmceeSampleUITests: XCTestCase {
         XCTFail("Failure from xcui tests")
     }
     
+    func test___skipped() throws {
+        let app = XCUIApplication()
+        app.launch()
+        
+        Thread.sleep(forTimeInterval: 2)
+        
+        throw XCTSkip("Skipping this test")
+    }
 }