diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
index ddfd21dc78..d93592a6a3 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
@@ -156,9 +156,6 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             "--targets", "farm"
         ]
 
-        if is_in_tests():
-            args.append("--automatic-tests")
-
         # Generate the payload for Deadline submission
         secondary_pool = (
             self.deadline_pool_secondary or instance.data.get("secondaryPool")
diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
index 11bdc461f6..643dcc1c46 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
@@ -234,9 +234,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "--targets", "farm"
         ]
 
-        if is_in_tests():
-            args.append("--automatic-tests")
-
         # Generate the payload for Deadline submission
         secondary_pool = (
             self.deadline_pool_secondary or instance.data.get("secondaryPool")
diff --git a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 4081f02015..dbd1798608 100644
--- a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -502,8 +502,6 @@ def inject_ayon_environment(deadlinePlugin):
             "extractenvironments",
             export_url
         ]
-        if job.GetJobEnvironmentKeyValue("AYON_IN_TESTS"):
-            args.append("--automatic-tests")
 
         for key, value in add_kwargs.items():
             args.extend(["--{}".format(key), value])
@@ -517,6 +515,10 @@ def inject_ayon_environment(deadlinePlugin):
             "AYON_API_KEY": ayon_api_key,
             "AYON_BUNDLE_NAME": ayon_bundle_name,
         }
+
+        automatic_tests = job.GetJobEnvironmentKeyValue("AYON_IN_TESTS")
+        if automatic_tests:
+            environment["AYON_IN_TESTS"] = automatic_tests
         for env, val in environment.items():
             # Add the env var for the Render Plugin that is about to render
             deadlinePlugin.SetEnvironmentVariable(env, val)