diff --git a/SharpCompress.snk b/SharpCompress.snk
new file mode 100644
index 000000000..e1aa6a29d
Binary files /dev/null and b/SharpCompress.snk differ
diff --git a/src/SharpCompress/AssemblyInfo.cs b/src/SharpCompress/AssemblyInfo.cs
index 4c64dfac2..8c6513cd6 100644
--- a/src/SharpCompress/AssemblyInfo.cs
+++ b/src/SharpCompress/AssemblyInfo.cs
@@ -4,6 +4,22 @@
 
 [assembly: AssemblyTitle("SharpCompress")]
 [assembly: AssemblyProduct("SharpCompress")]
-[assembly: InternalsVisibleTo("SharpCompress.Test")]
-[assembly: InternalsVisibleTo("SharpCompress.Test.Portable")]
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: InternalsVisibleTo("SharpCompress.Test" + SharpCompress.AssemblyInfo.PublicKeySuffix)]
+[assembly: InternalsVisibleTo("SharpCompress.Test.Portable"  + SharpCompress.AssemblyInfo.PublicKeySuffix)]
+[assembly: CLSCompliant(true)]
+
+namespace SharpCompress
+{
+    /// <summary>
+    /// Just a static class to house the public key, to avoid repetition.
+    /// </summary>
+    internal static class AssemblyInfo
+    {
+        internal const string PublicKeySuffix =
+            ",PublicKey=002400000480000094000000060200000024000052534131000400000100010059acfa17d26c44" +
+            "7a4d03f16eaa72c9187c04f16e6569dd168b080e39a6f5c9fd00f28c768cd8e9a089d5a0e1b34c" +
+            "cd971488e7afe030ce5ce8df2053cf12ec89f6d38065c434c09ee6af3ee284c5dc08f44774b679" +
+            "bf39298e57efe30d4b00aecf9e4f6f8448b2cb0146d8956dfcab606cc64a0ac38c60a7d78b0d65" +
+            "d3b98dc0";
+    }
+}
diff --git a/src/SharpCompress/project.json b/src/SharpCompress/project.json
index 9412b9115..9c086a48f 100644
--- a/src/SharpCompress/project.json
+++ b/src/SharpCompress/project.json
@@ -13,7 +13,8 @@
     },
     "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
+        "allowUnsafe": true,
+        "keyFile": "../../SharpCompress.snk"
     },
     "frameworks": {
         "net35": {
diff --git a/test/SharpCompress.Test/project.json b/test/SharpCompress.Test/project.json
index 220ee5c22..0315281d0 100644
--- a/test/SharpCompress.Test/project.json
+++ b/test/SharpCompress.Test/project.json
@@ -1,4 +1,8 @@
 {
+    "buildOptions": {
+        "keyFile": "../../SharpCompress.snk"
+    },
+
     "testRunner": "xunit",
 
     "frameworks": {