diff --git a/src/SimpleFixture.FakeItEasy/SimpleFixture.FakeItEasy.csproj b/src/SimpleFixture.FakeItEasy/SimpleFixture.FakeItEasy.csproj
index 2e010cb..0d357a0 100644
--- a/src/SimpleFixture.FakeItEasy/SimpleFixture.FakeItEasy.csproj
+++ b/src/SimpleFixture.FakeItEasy/SimpleFixture.FakeItEasy.csproj
@@ -18,9 +18,8 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <DebugType>full</DebugType>
     <SignAssembly>True</SignAssembly>
-    <DelaySign>False</DelaySign>
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-    <AssemblyOriginatorKeyFile>..\..\tools\SimpleFixture.snk</AssemblyOriginatorKeyFile>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SimpleFixture.MSTest/SimpleFixture.MSTest.csproj b/src/SimpleFixture.MSTest/SimpleFixture.MSTest.csproj
index b741802..4531644 100644
--- a/src/SimpleFixture.MSTest/SimpleFixture.MSTest.csproj
+++ b/src/SimpleFixture.MSTest/SimpleFixture.MSTest.csproj
@@ -11,7 +11,9 @@
     <PackageLicenseUrl>https://github.com/ipjohnson/SimpleFixture/blob/master/License.md</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/ipjohnson/SimpleFixture</RepositoryUrl>
-    <AssemblyOriginatorKeyFile>..\..\tools\SimpleFixture.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>True</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
     <DebugType>full</DebugType>
   </PropertyGroup>
 
diff --git a/src/SimpleFixture.Moq/SimpleFixture.Moq.csproj b/src/SimpleFixture.Moq/SimpleFixture.Moq.csproj
index 85a4ebe..8103dcf 100644
--- a/src/SimpleFixture.Moq/SimpleFixture.Moq.csproj
+++ b/src/SimpleFixture.Moq/SimpleFixture.Moq.csproj
@@ -16,7 +16,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <DebugType>full</DebugType>
-    <AssemblyOriginatorKeyFile>..\..\tools\SimpleFixture.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>True</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SimpleFixture.NSubstitute/SimpleFixture.NSubstitute.csproj b/src/SimpleFixture.NSubstitute/SimpleFixture.NSubstitute.csproj
index c9cfc58..7113f63 100644
--- a/src/SimpleFixture.NSubstitute/SimpleFixture.NSubstitute.csproj
+++ b/src/SimpleFixture.NSubstitute/SimpleFixture.NSubstitute.csproj
@@ -15,8 +15,10 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <AssemblyOriginatorKeyFile>..\..\tools\SimpleFixture.snk</AssemblyOriginatorKeyFile>
     <DebugType>full</DebugType>
+    <SignAssembly>True</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tools/SimpleFixture.snk b/src/SimpleFixture.snk
similarity index 100%
rename from tools/SimpleFixture.snk
rename to src/SimpleFixture.snk
diff --git a/src/SimpleFixture.xUnit/SimpleFixture.xUnit.csproj b/src/SimpleFixture.xUnit/SimpleFixture.xUnit.csproj
index d94ae75..75c5c7e 100644
--- a/src/SimpleFixture.xUnit/SimpleFixture.xUnit.csproj
+++ b/src/SimpleFixture.xUnit/SimpleFixture.xUnit.csproj
@@ -17,6 +17,9 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <DebugType>full</DebugType>
+    <SignAssembly>True</SignAssembly>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SimpleFixture/SimpleFixture.csproj b/src/SimpleFixture/SimpleFixture.csproj
index 7f36ee6..402d7cd 100644
--- a/src/SimpleFixture/SimpleFixture.csproj
+++ b/src/SimpleFixture/SimpleFixture.csproj
@@ -18,9 +18,8 @@
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <DebugType>full</DebugType>
     <SignAssembly>True</SignAssembly>
-    <DelaySign>False</DelaySign>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' AND '$(APPVEYOR)' != 'True'">true</PublicSign>
-    <AssemblyOriginatorKeyFile>..\..\tools\SimpleFixture.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>..\SimpleFixture.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
 </Project>