diff --git a/ElementX/SupportingFiles/target.yml b/ElementX/SupportingFiles/target.yml
index ab2fab0ff..3d1842928 100644
--- a/ElementX/SupportingFiles/target.yml
+++ b/ElementX/SupportingFiles/target.yml
@@ -36,8 +36,6 @@ schemes:
       testPlans:
         - path: ../../UnitTests/SupportingFiles/UnitTests.xctestplan
           defaultPlan: true
-      environmentVariables:
-        IS_RUNNING_UNIT_TESTS: "1"
 
 targets:
   ElementX:
diff --git a/UnitTests/SupportingFiles/UnitTests.xctestplan b/UnitTests/SupportingFiles/UnitTests.xctestplan
index 7cdc388e4..7b5209dd3 100644
--- a/UnitTests/SupportingFiles/UnitTests.xctestplan
+++ b/UnitTests/SupportingFiles/UnitTests.xctestplan
@@ -10,6 +10,12 @@
   ],
   "defaultOptions" : {
     "defaultTestExecutionTimeAllowance" : 60,
+    "environmentVariableEntries" : [
+      {
+        "key" : "IS_RUNNING_UNIT_TESTS",
+        "value" : "1"
+      }
+    ],
     "testTimeoutsEnabled" : true
   },
   "testTargets" : [
diff --git a/UnitTests/SupportingFiles/target.yml b/UnitTests/SupportingFiles/target.yml
index db013a09d..8f28d8f1b 100644
--- a/UnitTests/SupportingFiles/target.yml
+++ b/UnitTests/SupportingFiles/target.yml
@@ -14,8 +14,6 @@ schemes:
     run:
       config: Debug
       disableMainThreadChecker: false
-      environmentVariables:
-        IS_RUNNING_UNIT_TESTS: "1"
     test:
       config: Debug
       disableMainThreadChecker: false