diff --git a/Directory.Build.props b/Directory.Build.props
index ee18093..6e73809 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -60,11 +60,4 @@
   <PropertyGroup>
     <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts</BaseArtifactsPath>
   </PropertyGroup>
-
-  <!-- Strong Name Signing -->
-  <PropertyGroup Condition="'$(MicroBuild_SigningEnabled)' != 'true'">
-    <PublicSign>true</PublicSign>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\MicrosoftCorporation.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ffe3c00..0e7bd05 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,11 @@
 <Project>
   <!-- Strong-naming -->
+  <PropertyGroup Condition="'$(MicroBuild_SigningEnabled)' != 'true'">
+    <PublicSign>true</PublicSign>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\MicrosoftCorporation.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(SignType)' == 'Test'">
     <SignAssembly>true</SignAssembly>
     <DelaySign Condition="'$(MicroBuild_SigningTargetsImported)' == 'true'">true</DelaySign>
diff --git a/src/BuildPrediction/Microsoft.Build.Prediction.csproj b/src/BuildPrediction/Microsoft.Build.Prediction.csproj
index e60a13e..2d9ae00 100644
--- a/src/BuildPrediction/Microsoft.Build.Prediction.csproj
+++ b/src/BuildPrediction/Microsoft.Build.Prediction.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.Build.Prediction.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293" />
+    <InternalsVisibleTo Include="Microsoft.Build.Prediction.Tests" Key="002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293" />
   </ItemGroup>
 
   <!-- Signing -->