diff --git a/scripts/common/_common.ps1 b/scripts/common/_common.ps1
index 35a469516..aaf0bb623 100644
--- a/scripts/common/_common.ps1
+++ b/scripts/common/_common.ps1
@@ -18,9 +18,6 @@ $PackageDir = $env:PackageDir
 $TestBinRoot = $env:TestBinRoot
 $TestPackageDir = $env:TestPackageDir
 
-$env:TEST_ROOT = "$OutputDir\tests"
-$env:TEST_ARTIFACTS = "$env:TEST_ROOT\artifacts"
-
 $env:Channel = "$env:RELEASE_SUFFIX"
 
 # Set reasonable defaults for unset variables
diff --git a/scripts/common/_common.sh b/scripts/common/_common.sh
index 5f0477930..f0ce262e5 100644
--- a/scripts/common/_common.sh
+++ b/scripts/common/_common.sh
@@ -14,9 +14,6 @@ COMMONDIR="$( cd -P "$( dirname "$COMMONSOURCE" )" && pwd )"
 source "$COMMONDIR/_prettyprint.sh"
 
 # Other variables are set by the outer build script
-export TEST_ROOT="$OUTPUT_ROOT/tests"  
-export TEST_ARTIFACTS="$TEST_ROOT/artifacts"  
-
 export CHANNEL=$RELEASE_SUFFIX
 
 [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID
diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs
index f990518ec..76f2fe032 100644
--- a/scripts/dotnet-cli-build/TestTargets.cs
+++ b/scripts/dotnet-cli-build/TestTargets.cs
@@ -190,6 +190,7 @@ namespace Microsoft.DotNet.Cli.Build
                     .WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test", project))
                     .Environment(vsvars)
                     .EnvironmentVariable("PATH", $"{DotNetCli.Stage2.BinPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}")
+                    .EnvironmentVariable("TEST_ARTIFACTS", Dirs.TestArtifacts)
                     .Execute();
                 if (result.ExitCode != 0)
                 {
diff --git a/scripts/dotnet-cli-build/Utils/Dirs.cs b/scripts/dotnet-cli-build/Utils/Dirs.cs
index c90b63406..98ee39fc1 100644
--- a/scripts/dotnet-cli-build/Utils/Dirs.cs
+++ b/scripts/dotnet-cli-build/Utils/Dirs.cs
@@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Cli.Build
         public static readonly string Stage2Compilation = Path.Combine(Output, "stage2compilation");
         public static readonly string Corehost = Path.Combine(Output, "corehost");
         public static readonly string TestOutput = Path.Combine(Output, "tests");
+        public static readonly string TestArtifacts = Path.Combine(TestOutput, "artifacts");
         public static readonly string TestPackages = Path.Combine(TestOutput, "packages");
 
         public static readonly string OSXReferenceAssembliesPath = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks";