diff --git a/gson/src/test/java/com/google/gson/functional/MapTest.java b/gson/src/test/java/com/google/gson/functional/MapTest.java
index 6065ca06..fce325a0 100755
--- a/gson/src/test/java/com/google/gson/functional/MapTest.java
+++ b/gson/src/test/java/com/google/gson/functional/MapTest.java
@@ -490,7 +490,32 @@ public class MapTest extends TestCase {
     } catch (JsonSyntaxException expected) {
     }
   }
-
+  
+  public void testSerializeMapOfMaps() {
+    Type type = new TypeToken<Map<String, Map<String, String>>>() {}.getType();
+    Map<String, Map<String, String>> map = newMap(
+        "a", newMap("ka1", "va1", "ka2", "va2"),
+        "b", newMap("kb1", "vb1", "kb2", "vb2"));
+    assertEquals("{'a':{'ka1':'va1','ka2':'va2'},'b':{'kb1':'vb1','kb2':'vb2'}}",
+        gson.toJson(map, type).replace('"', '\''));
+  }
+  
+  public void testDeerializeMapOfMaps() {
+    Type type = new TypeToken<Map<String, Map<String, String>>>() {}.getType();
+    Map<String, Map<String, String>> map = newMap(
+        "a", newMap("ka1", "va1", "ka2", "va2"),
+        "b", newMap("kb1", "vb1", "kb2", "vb2"));
+    String json = "{'a':{'ka1':'va1','ka2':'va2'},'b':{'kb1':'vb1','kb2':'vb2'}}";
+    assertEquals(map, gson.fromJson(json, type));
+  }
+  
+  private <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
+    Map<K, V> result = new LinkedHashMap<K, V>();
+    result.put(key1, value1);
+    result.put(key2, value2);
+    return result;
+  }
+    
   public void testMapNamePromotionWithJsonElementReader() {
     String json = "{'2.3':'a'}";
     Map<Double, String> map = new LinkedHashMap<Double, String>();