diff --git a/builder/actions/setup_cross_ci_crt_environment.py b/builder/actions/setup_cross_ci_crt_environment.py
index 5d6277698..57894902e 100644
--- a/builder/actions/setup_cross_ci_crt_environment.py
+++ b/builder/actions/setup_cross_ci_crt_environment.py
@@ -19,8 +19,13 @@
 
 
 class SetupCrossCICrtEnvironment(Action):
+    def __init__(self, use_xcodebuild=False):
+        # set to true if using Apple XCodebuild
+        self.use_xcodebuild = use_xcodebuild
 
     def _setenv(self, env, env_name, env_data, is_secret=False):
+        if self.use_xcodebuild:
+            env_name = "TEST_RUNNER_"+env_name
         # Kinda silly to have a function for this, but makes the API calls consistent and looks better
         # beside the other functions...
         env.shell.setenv(env_name, str(env_data), is_secret=is_secret)
@@ -433,7 +438,7 @@ def _common_setup(self, env):
 
         pass
 
-    def run(self, env):
+    def run(self, env, is_xcodebuild=False):
         # A special environment variable indicating that we want to dump test environment variables to a specified file.
         env_dump_file = env.shell.getenv("AWS_SETUP_CRT_TEST_ENVIRONMENT_DUMP_FILE")