diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
index b8a8a5f2d7fbe55242b12b45208d7bb31049cab0..3f191b24377483d71711a187ff380055320e95f5 100644
--- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
+++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
@@ -5,6 +5,7 @@
     <ProjectGuid>{853BB14F-8A5B-42B4-A053-21DE1AEBB335}</ProjectGuid>
     <RootNamespace>ConventionsUnitTests</RootNamespace>
     <AssemblyName>System.Composition.Convention.Tests</AssemblyName>
+    <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/libraries/buildpipeline/pipeline.json b/src/libraries/buildpipeline/pipeline.json
index cd57c3c1e7d9494f9dbe5976833afc02b095efc6..8b64f611e6ca15c9fd9cba4396297d74eb51b216 100644
--- a/src/libraries/buildpipeline/pipeline.json
+++ b/src/libraries/buildpipeline/pipeline.json
@@ -529,7 +529,7 @@
             "TestContainerSuffix": "windows10desktop",
             "TargetTestCategory": "Full Framework",
             "FilterToTestTFM": "net46",
-            "TestNugetRuntimeId": "win10-x64",
+            "TestNugetRuntimeId": "win-x64",
             "EnableCloudTest": "true"
           },
           "ReportingParameters": {
@@ -903,7 +903,7 @@
             "TestContainerSuffix": "windows10desktop",
             "TargetTestCategory": "Full Framework",            
             "FilterToTestTFM": "net46",
-            "TestNugetRuntimeId": "win10-x64",
+            "TestNugetRuntimeId": "win-x64",
             "EnableCloudTest": "true"
           },
           "ReportingParameters": {