diff --git a/src/test/java/com/samskivert/mustache/MustacheTest.java b/src/test/java/com/samskivert/mustache/MustacheTest.java
index e32e689..f0f5738 100644
--- a/src/test/java/com/samskivert/mustache/MustacheTest.java
+++ b/src/test/java/com/samskivert/mustache/MustacheTest.java
@@ -10,7 +10,9 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Optional;
 import java.util.TimeZone;
 
@@ -255,4 +257,13 @@ public class MustacheTest extends SharedTests
                   Date today = new Date(1389208567874L);
               }));
     }
+
+    @Test public void testMapEntriesPlusReflectSection () {
+        Map<String,String> data = new HashMap<String,String>();
+        data.put("k1", "v1");
+        data.put("k2", "v2");
+        // 'key' and 'value' here rely on reflection so we can't test this in GWT
+        test("k1v1k2v2", "{{#map.entrySet}}{{key}}{{value}}{{/map.entrySet}}",
+             context("map", data));
+    }
 }
diff --git a/src/test/java/com/samskivert/mustache/SharedTests.java b/src/test/java/com/samskivert/mustache/SharedTests.java
index 6041685..903e272 100644
--- a/src/test/java/com/samskivert/mustache/SharedTests.java
+++ b/src/test/java/com/samskivert/mustache/SharedTests.java
@@ -74,7 +74,8 @@ public abstract class SharedTests extends GWTTestCase
         Map<String,String> data = new HashMap<String,String>();
         data.put("k1", "v1");
         data.put("k2", "v2");
-        test("k1v1k2v2", "{{#map.entrySet}}{{key}}{{value}}{{/map.entrySet}}",
+        test(Mustache.compiler().escapeHTML(false),
+             "k1=v1k2=v2", "{{#map.entrySet}}{{.}}{{/map.entrySet}}",
              context("map", data));
     }