diff --git a/Directory.Build.props b/Directory.Build.props
index 6e927fe5da..dd7a10a14a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -39,6 +39,8 @@
     <!-- PDB -->
     <DebugSymbols>true</DebugSymbols>
     <DebugType>embedded</DebugType>
+    <!-- Needs to be part of the building of prod code -->
+    <MoqPublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</MoqPublicKey>
   </PropertyGroup>
 
   <!-- Pack config -->
@@ -57,14 +59,6 @@
     <PolyGuard>true</PolyGuard>
   </PropertyGroup>
 
-  <!-- Test config -->
-  <PropertyGroup>
-    <TestRunnerName>TestingPlatformRunner</TestRunnerName>
-    <!-- By default we run tests with VSTest runner and custom test framework. Platform projects will use a different runner and framework -->
-    <UseVSTestRunner Condition=" '$(UseVSTestRunner)' == '' " >true</UseVSTestRunner>
-    <MoqPublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</MoqPublicKey>
-  </PropertyGroup>
-
   <ItemGroup>
     <Using Include="System.Collections" />
     <Using Include="System.Collections.Concurrent" />
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index eff3b61968..ba09b08e0e 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,8 +3,16 @@
 
   <Import Project="../Directory.Build.props" />
 
-  <!-- Testing -->
   <PropertyGroup>
+    <TestRunnerName>TestingPlatformRunner</TestRunnerName>
+    <!-- By default we run tests with VSTest runner and custom test framework. Platform projects will use a different runner and framework -->
+    <UseVSTestRunner Condition=" '$(UseVSTestRunner)' == '' " >true</UseVSTestRunner>
+  </PropertyGroup>
+
+  <!-- Build & pack tests -->
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <PublishAot Condition=" '$(PublishAot)' == '' ">false</PublishAot>
     <!-- At the moment we don't run single file tests we should do it in integration/isolation -->
     <EnableSingleFileAnalyzer>false</EnableSingleFileAnalyzer>
     <EnableCodeCoverage Condition=" '$(EnableCodeCoverage)' == '' ">true</EnableCodeCoverage>
@@ -14,10 +22,4 @@
     <TestCaptureOutput Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">false</TestCaptureOutput>
   </PropertyGroup>
 
-  <!-- Build & pack -->
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <PublishAot Condition=" '$(PublishAot)' == '' ">false</PublishAot>
-  </PropertyGroup>
-
 </Project>