diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml
index 3320945bebdb..7247e244cd8e 100644
--- a/.azure-pipelines/ultimate-pipeline.yml
+++ b/.azure-pipelines/ultimate-pipeline.yml
@@ -2302,7 +2302,6 @@ stages:
     variables:
       TestAllPackageVersions: true
       IncludeMinorPackageVersions:  $[eq(variables.perform_comprehensive_testing, 'true')]
-      IntegrationTestFilter: DockerGroup=$(dockerGroup)
 
     pool:
       name: $(linuxX64Pool)
@@ -2319,6 +2318,14 @@ stages:
     - template: steps/download-samples.yml
       parameters:
         framework: $(publishTargetFramework)
+    - bash: |
+        if [ -z "$(IntegrationTestFilter)" ]; then
+          newFilter="DockerGroup=$(dockerGroup)"
+        else
+          newFilter="$(IntegrationTestFilter)&(DockerGroup=$(dockerGroup))"
+        fi
+        echo "##vso[task.setvariable variable=IntegrationTestFilter]$newFilter"
+      displayName: "Calculate IntegrationTestFilter"
 
     # when we build samples separately, we could run this step and the docker-compose one below in //
     # (currently the docker-compose step relies on serverless samples)
diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs
index 305057fb43e5..4904f23a2181 100644
--- a/tracer/build/_build/Build.VariableGenerations.cs
+++ b/tracer/build/_build/Build.VariableGenerations.cs
@@ -107,7 +107,7 @@ void GenerateConditionVariableBasedOnGitChange(ChangedTeamValue changedTeamValue
                 {
                     var baseBranch = string.IsNullOrEmpty(TargetBranch) ? ReleaseBranchForCurrentVersion() : $"origin/{TargetBranch}";
                     bool isChanged = false;
-                    var forceExplorationTestsWithVariableName = $"force_exploration_tests_with_{changedTeamValue.VariableName}";
+                    var forceExplorationTestsWithVariableName = $"force_run_tests_with_{changedTeamValue.VariableName}";
 
                     if (Environment.GetEnvironmentVariable("BUILD_REASON") == "Schedule" && bool.Parse(Environment.GetEnvironmentVariable("isMainBranch") ?? "false"))
                     {