diff --git a/Modules/Tests/WordPressSharedTests/WordPressShared.xctestplan b/TestPlans/WordPressShared.xctestplan
similarity index 88%
rename from Modules/Tests/WordPressSharedTests/WordPressShared.xctestplan
rename to TestPlans/WordPressShared.xctestplan
index bb65c9976d92..d6680d687e60 100644
--- a/Modules/Tests/WordPressSharedTests/WordPressShared.xctestplan
+++ b/TestPlans/WordPressShared.xctestplan
@@ -1,7 +1,7 @@
 {
   "configurations" : [
     {
-      "id" : "D6F49D5C-3B89-4ED4-BE33-0A53AD094239",
+      "id" : "7C90A6CA-90C7-482F-8A64-65F06BC6DDE6",
       "name" : "Test Scheme Action",
       "options" : {
 
diff --git a/WordPress.xcworkspace/contents.xcworkspacedata b/WordPress.xcworkspace/contents.xcworkspacedata
index 36e89c89701f..e1bc1296b185 100644
--- a/WordPress.xcworkspace/contents.xcworkspacedata
+++ b/WordPress.xcworkspace/contents.xcworkspacedata
@@ -4,7 +4,4 @@
    <FileRef
       location = "group:WordPress/WordPress.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Modules/Tests/WordPressSharedTests/WordPressShared.xctestplan">
-   </FileRef>
 </Workspace>
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index a0529bbb2ba1..8d8f98263e83 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -1319,6 +1319,12 @@
 			path = KeystoneTests;
 			sourceTree = "<group>";
 		};
+		0CBAFE7D2F62F0DF00019FC2 /* TestPlans */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			name = TestPlans;
+			path = ../TestPlans;
+			sourceTree = SOURCE_ROOT;
+		};
 		0CED35262D959427003015CF /* Misc */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
 			path = Misc;
@@ -1754,6 +1760,7 @@
 				3FD4B20E2DCC468200781DFA /* Modules */,
 				0C5C46FB2D98395300F2CD55 /* Sources */,
 				0C5A19CB2D9B07E700C25301 /* Tests */,
+				0CBAFE7D2F62F0DF00019FC2 /* TestPlans */,
 				F14B5F6F208E648200439554 /* config */,
 				E1B34C091CCDFFCE00889709 /* Credentials */,
 				24CE57C42CD3375200C7B37D /* Classes */,
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressShared.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressShared.xcscheme
deleted file mode 100644
index 68d022cc1d87..000000000000
--- a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/WordPressShared.xcscheme
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "2630"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      buildArchitectures = "Automatic">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WordPressShared"
-               BuildableName = "WordPressShared"
-               BlueprintName = "WordPressShared"
-               ReferencedContainer = "container:../Modules">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:../Modules/Tests/WordPressSharedTests/WordPressShared.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
-   </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 = "WordPressShared"
-            BuildableName = "WordPressShared"
-            BlueprintName = "WordPressShared"
-            ReferencedContainer = "container:../Modules">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>