diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index 604f21bc3d41..52a9582ef7fc 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -1410,6 +1410,7 @@ js::Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
 # define END_CASE_LEN3      len = 3; goto advance_pc;
 # define END_CASE_LEN4      len = 4; goto advance_pc;
 # define END_CASE_LEN5      len = 5; goto advance_pc;
+# define END_CASE_LEN7      len = 7; goto advance_pc;
 # define END_VARLEN_CASE    goto advance_pc;
 # define ADD_EMPTY_CASE(OP) BEGIN_CASE(OP)
 # define END_EMPTY_CASES    goto advance_pc_by_one;
diff --git a/js/src/tests/ecma_6/Map/jstests.list b/js/src/tests/ecma_6/Map/jstests.list
new file mode 100644
index 000000000000..bb68abf7d584
--- /dev/null
+++ b/js/src/tests/ecma_6/Map/jstests.list
@@ -0,0 +1,2 @@
+url-prefix ../../jsreftest.html?test=ecma_6/Map/
+script NaN-as-key.js
diff --git a/js/src/tests/ecma_6/Set/jstests.list b/js/src/tests/ecma_6/Set/jstests.list
new file mode 100644
index 000000000000..3c3be4cb98e1
--- /dev/null
+++ b/js/src/tests/ecma_6/Set/jstests.list
@@ -0,0 +1,2 @@
+url-prefix ../../jsreftest.html?test=ecma_6/Set/
+script NaN-as-key.js