diff --git a/src/redist/targets/BundledComponents.targets b/src/redist/targets/BundledComponents.targets
index 5c4610240..09fad7527 100644
--- a/src/redist/targets/BundledComponents.targets
+++ b/src/redist/targets/BundledComponents.targets
@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
+  </PropertyGroup>
+  
   <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo">
     <PropertyGroup>
       <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
@@ -177,17 +181,17 @@
     
   </Target>
 
-  <Target Name="CleanPublishDir">
+  <Target Name="CleanLayoutPath">
     <!-- Remove everything from the publish directory so we don't have left over items from previous builds -->
-    <RemoveDir Directories="$(PublishDir)" />
-    <MakeDir Directories="$(PublishDir)" />
+    <RemoveDir Directories="$(RedistLayoutPath)" />
+    <MakeDir Directories="$(RedistLayoutPath)" />
   </Target>
   
-  <Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanPublishDir"
+  <Target Name="LayoutBundledComponents" DependsOnTargets="DownloadBundledComponents;CleanLayoutPath"
           AfterTargets="Build">
 
     <ExtractArchiveToDirectory SourceArchive="%(BundledLayoutComponent.DownloadDestination)"
-                               DestinationDirectory="$(PublishDir)/%(BundledLayoutComponent.RelativeLayoutPath)" />
+                               DestinationDirectory="$(RedistLayoutPath)/%(BundledLayoutComponent.RelativeLayoutPath)" />
   
   </Target>
 </Project>
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
index 27f704575..0200bd607 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs
@@ -55,8 +55,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
                 else
                 {
                     string configuration = new DirectoryInfo(AppContext.BaseDirectory).Parent.Name;
-                    //  TODO: Don't put in framework-specific folder (so we don't need to sync TFM here)
-                    DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "netcoreapp3.0", "publish", "dotnet" + dotnetExtension);
+                    DotnetUnderTest = Path.Combine(RepoRoot, "artifacts", "bin", "redist", configuration, "dotnet", "dotnet" + dotnetExtension);
                 }
             }
         }