diff --git a/eng/Tools.props b/eng/Tools.props
index 1a9804dbaf692..a9a9fb714be97 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
+    <PackageReference Include="Microsoft.DotNet.PackageValidation" Version="$(MicrosoftDotNetPackageValidationVersion)" />
     <!-- enable source link in pkgproj -->
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1fb76352ca451..06bd204507811 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -206,5 +206,9 @@
       <Uri>https://github.com/dotnet/xharness</Uri>
       <Sha>dfce3c1b43968f7e172b9a2ead777999ea0a94b2</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.PackageValidation" Version="6.0.0-beta.21167.3">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
+    </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index bb4d3725726f7..3e99198fdb7bf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -61,6 +61,7 @@
     <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21167.3</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21167.3</MicrosoftDotNetRemoteExecutorVersion>
     <MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21167.3</MicrosoftDotNetVersionToolsTasksVersion>
+    <MicrosoftDotNetPackageValidationVersion>6.0.0-beta.21167.3</MicrosoftDotNetPackageValidationVersion>
     <!-- NuGet dependencies -->
     <NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
     <!-- Installer dependencies -->
diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj
index a2d8db90aaffb..c8ce490bca615 100644
--- a/src/libraries/pkg/test/testPackages.proj
+++ b/src/libraries/pkg/test/testPackages.proj
@@ -1,11 +1,12 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
 
+  <PropertyGroup>
+    <PackageNamePattern>[a-zA-z\.]*\.</PackageNamePattern>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackagesToTest Condition="'$(PackagesToTest)' != ''" Include="$(PackagesToTest)" />
-    <!-- transport package not expected to be closure complete  -->
-    <ExcludePackages Include="Microsoft.AspNetCore.Internal.Transport" />
-    <ExcludePackages Include="$(ExcludePackages)" />
 
     <PackageReports Condition="'@(PackagesToTest)' == ''" Include="$(PackageReportDir)*.json" Exclude="@(ExcludePackages->'$(PackageReportDir)%(Identity).json')"/>
     <PackageReports Condition="'@(PackagesToTest)' != ''" Include="@(PackagesToTest->'$(PackageReportDir)%(Identity).json')" />
@@ -13,9 +14,20 @@
     <!-- support override via commandline -->
     <RuntimesToInclude Condition="'$(RuntimesToInclude)' != ''" Include="$(RuntimesToInclude)" />
     <TargetFrameworksToInclude Condition="'$(TargetFrameworksToInclude)' != ''" Include="$(TargetFrameworksToInclude)" />
+    <SymbolsPackages Include="$(LibrariesAllConfigShippingPackagesDir)*.symbols.nupkg" />
+    
+    <AllPackagesFilePath Include="$(LibrariesAllConfigShippingPackagesDir)*.nupkg" Exclude="@(SymbolsPackages)" Condition="Exists('$(LibrariesAllConfigShippingPackagesDir)')">
+      <PackageName>$([System.String]::new($([System.Text.RegularExpressions.Regex]::Match($([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)')), $(PackageNamePattern)))).TrimEnd('.'))</PackageName>
+      <PackagePath>%(Identity)</PackagePath>
+    </AllPackagesFilePath>
+    <AllPackages Include="@(AllPackagesFilePath->'%(PackageName)')" />
+
+    <ExcludePackages Condition="'$(PackagesToTest)' != ''" Include="@(AllPackages)" Exclude="@(PackagesToTest)" />
+    <TestPackages Include="@(AllPackages)" Exclude="@(ExcludePackages)"/>
+    <TestPackagesPath Include="@(TestPackages->'%(PackagePath)')" />
 
     <!-- we don't build alpine or older OSX versions -->
-    <RuntimesToExclude Include="alpine.3.4.3-x64;osx.10.10-x64;osx.10.11-x64" />
+    <RuntimesToExclude Include="alpine.3.4.3-x64;osx.10.10-x64;osx.10.11-x64;freebsd-x64" />
 
     <!-- no targeting pack was ever shipped for net463 -->
     <TargetFrameworksToExclude Include="net463" />
@@ -70,10 +82,12 @@
     <Copy SourceFiles="@(TestSupportFiles)" DestinationFolder="%(TestSupportFiles.DestinationFolder)" />
   </Target>
 
+  <UsingTask TaskName="GetCompatiblePackageTargetFrameworks" AssemblyFile="$(DotNetPackageValidationAssembly)"/>
+
   <Target Name="GetSupportedPackages">
-    <GetSupportedPackagesFromPackageReports PackageReports="@(PackageReports)">
-      <Output TaskParameter="SupportedPackages" ItemName="SupportedPackage"/>
-    </GetSupportedPackagesFromPackageReports>
+    <GetCompatiblePackageTargetFrameworks PackagePaths="@(TestPackagesPath)">
+      <Output TaskParameter="TestProjects" ItemName="SupportedPackage" />
+    </GetCompatiblePackageTargetFrameworks>
 
     <ItemGroup>
       <SupportedPackage>
@@ -119,7 +133,7 @@
 
   <Target Name="GenerateProjects"
           DependsOnTargets="GetSupportedPackages;CreateTestDir"
-          Inputs="@(PackageReports);$(ProjectTemplate)"
+          Inputs="@(TestPackagesPath);$(ProjectTemplate)"
           Outputs="%(SupportedPackage.ProjectFile)">
     <PropertyGroup>
       <_projectDir>%(SupportedPackage.ProjectDir)/</_projectDir>