diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml
index d677e7d55..6b5da5bf4 100644
--- a/ElementX/SupportingFiles/target.yml
+++ b/ElementX/SupportingFiles/target.yml
@@ -33,8 +33,9 @@ schemes:
       gatherCoverageData: true
       coverageTargets:
         - ElementX
-      targets:
-        - UnitTests
+      testPlans:
+        - path: ../../UnitTests/SupportingFiles/UnitTests.xctestplan
+          defaultPlan: true
       environmentVariables:
         IS_RUNNING_UNIT_TESTS: "1"
 
diff --git a/IntegrationTests/SupportingFiles/IntegrationTests.xctestplan b/IntegrationTests/SupportingFiles/IntegrationTests.xctestplan
new file mode 100644
index 000000000..97171ce3a
--- /dev/null
+++ b/IntegrationTests/SupportingFiles/IntegrationTests.xctestplan
@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "AEF793E9-1B0B-4383-BFE4-68E19BAEDC7F",
+      "name" : "Default",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:ElementX.xcodeproj",
+        "identifier" : "D3DB351B7FBE0F49649171FC",
+        "name" : "IntegrationTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/IntegrationTests/SupportingFiles/target.yml b/IntegrationTests/SupportingFiles/target.yml
index 413f13a96..405ce20d1 100644
--- a/IntegrationTests/SupportingFiles/target.yml
+++ b/IntegrationTests/SupportingFiles/target.yml
@@ -24,8 +24,9 @@ schemes:
       gatherCoverageData: true
       coverageTargets:
         - ElementX
-      targets:
-      - IntegrationTests
+      testPlans:
+        - path: IntegrationTests.xctestplan
+          defaultPlan: true
 
 targets:
   IntegrationTests:
diff --git a/UnitTests/SupportingFiles/UnitTests.xctestplan b/UnitTests/SupportingFiles/UnitTests.xctestplan
new file mode 100644
index 000000000..7cdc388e4
--- /dev/null
+++ b/UnitTests/SupportingFiles/UnitTests.xctestplan
@@ -0,0 +1,25 @@
+{
+  "configurations" : [
+    {
+      "id" : "D789E5F1-30B8-4A23-B20E-281ACE05CFD6",
+      "name" : "Default",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "defaultTestExecutionTimeAllowance" : 60,
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:ElementX.xcodeproj",
+        "identifier" : "32C23C8D224D46EFE62AFAD0",
+        "name" : "UnitTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/UnitTests/SupportingFiles/target.yml b/UnitTests/SupportingFiles/target.yml
index 1bfebaf5f..db013a09d 100644
--- a/UnitTests/SupportingFiles/target.yml
+++ b/UnitTests/SupportingFiles/target.yml
@@ -22,8 +22,9 @@ schemes:
       gatherCoverageData: true
       coverageTargets:
         - ElementX
-      targets:
-      - UnitTests
+      testPlans:
+        - path: UnitTests.xctestplan
+          defaultPlan: true
 
 targets:
   UnitTests:
diff --git a/changelog.d/pr-740.change b/changelog.d/pr-740.change
new file mode 100644
index 000000000..b4789daaa
--- /dev/null
+++ b/changelog.d/pr-740.change
@@ -0,0 +1 @@
+Add test plans for other test targets.