diff --git a/test/unstable/mapIterators.chpl b/test/unstable/mapIterators.chpl
new file mode 100644
index 000000000000..1fbb89bd37dd
--- /dev/null
+++ b/test/unstable/mapIterators.chpl
@@ -0,0 +1,10 @@
+use Map;
+
+var m = new map(int, int);
+m[0] = 1;
+
+for key in m do
+  writeln(key);
+
+for (key, val) in m.items() do
+  writeln(key, "->", val);
diff --git a/test/unstable/mapIterators.good b/test/unstable/mapIterators.good
new file mode 100644
index 000000000000..4ed05af45a75
--- /dev/null
+++ b/test/unstable/mapIterators.good
@@ -0,0 +1,7 @@
+$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:392: In function '_getIterator':
+$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl:393: warning: 'Map.these' is unstable
+  mapIterators.chpl:6: called as _getIterator(x: map(int(64),int(64),false))
+note: generic instantiations are underlined in the above callstack
+mapIterators.chpl:9: note: 'Map.items' is unstable
+0
+0->1