diff --git a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
index 69851375..2d2d9797 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs
@@ -9563,25 +9563,6 @@ Path '', line 1, position 1.");
         }
 #endif
 
-#if !(NET20 || PORTABLE || PORTABLE40)
-        [Test]
-        public void DeserializeDictionaryOfHashSetsWithTypeNameHandlingAll()
-        {
-            var dictionary = new Dictionary<int, HashSet<string>>
-            {
-                { 1, new HashSet<string>(new[] { "test" }) },
-            };
-
-            var jsonSerializerSettings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
-
-            var obtainedJson = JsonConvert.SerializeObject(dictionary, jsonSerializerSettings);
-
-            var obtainedDictionary = (Dictionary<int, HashSet<string>>)JsonConvert.DeserializeObject(obtainedJson, jsonSerializerSettings);
-
-            Assert.IsNotNull(obtainedDictionary);
-        }
-#endif
-
 #if !(NETFX_CORE || DNXCORE50)
         [Test]
         public void MailMessageConverterTest()
diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
index 8c2e61ee..fb901669 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs
@@ -1892,12 +1892,14 @@ namespace Newtonsoft.Json.Tests.Serialization
         }
 #endif
 
+#if !(NET20 || PORTABLE || PORTABLE40)
         [Test]
-        public void DeserializeDictionary()
+        public void DeserializeComplexGenericDictionary_Simple()
         {
             JsonSerializerSettings serializerSettings = new JsonSerializerSettings
             {
-                TypeNameHandling = TypeNameHandling.All
+                TypeNameHandling = TypeNameHandling.All,
+                TypeNameAssemblyFormat = FormatterAssemblyStyle.Simple
             };
 
             Dictionary<int, HashSet<string>> dictionary = new Dictionary<int, HashSet<string>>
@@ -1911,6 +1913,28 @@ namespace Newtonsoft.Json.Tests.Serialization
 
             Assert.IsNotNull(obtainedDictionary);
         }
+
+        [Test]
+        public void DeserializeComplexGenericDictionary_Full()
+        {
+            JsonSerializerSettings serializerSettings = new JsonSerializerSettings
+            {
+                TypeNameHandling = TypeNameHandling.All,
+                TypeNameAssemblyFormat = FormatterAssemblyStyle.Full
+            };
+
+            Dictionary<int, HashSet<string>> dictionary = new Dictionary<int, HashSet<string>>
+            {
+                { 1, new HashSet<string>(new[] { "test" }) },
+            };
+
+            string obtainedJson = JsonConvert.SerializeObject(dictionary, serializerSettings);
+
+            Dictionary<int, HashSet<string>> obtainedDictionary = (Dictionary<int, HashSet<string>>)JsonConvert.DeserializeObject(obtainedJson, serializerSettings);
+
+            Assert.IsNotNull(obtainedDictionary);
+        }
+#endif
     }
 
     public class DataType
@@ -2183,5 +2207,4 @@ namespace Newtonsoft.Json.Tests.Serialization
     }
 #endif
 }
-
 #endif
\ No newline at end of file