diff --git a/.gitignore b/.gitignore
index 7bed92752c4..a5216b7f747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ dlldata.c
 # DNX
 project.lock.json
 artifacts/
+out/
 
 *_i.c
 *_p.c
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index 46407809de4..1c9ce7c763a 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -6,7 +6,7 @@
       <!-- BaseOutputDirectory is the root output path for this stage and RID
            BaseOutputPath is the project-specific output folder that each project builds into.
            This is not confusing at all. -->
-      <BaseOutputDirectory>$(RepoRoot)/artifacts/stage$(CliBuildStage)/$(Rid)</BaseOutputDirectory>
+      <BaseOutputDirectory>$(RepoRoot)/out/$(CliBuildStage)/$(Rid)</BaseOutputDirectory>
       <BaseOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/bin/$(MSBuildProjectName)'))</BaseOutputPath>
 
       <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(BaseOutputDirectory)/obj/$(MSBuildProjectName)'))</BaseIntermediateOutputPath>
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
index 6f465a5b170..a4cf0d64e86 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
@@ -99,7 +99,10 @@ public RepoDirectoriesProvider(
             string corehostDummyPackages = null,
             string pjDotnet = null)
         {
-            _artifacts = artifacts ?? Path.Combine(RepoRoot, "artifacts", "stage2", BuildRid);
+            _artifacts = artifacts ?? Path.Combine(RepoRoot,
+                                                   "out",
+                                                   "2",     //  Stage - ideally this would come from the CliBuildStage MSBuild property
+                                                   BuildRid);
             _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish");
             _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
             _pjDotnet = pjDotnet ?? GetPjDotnetPath();