diff --git a/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-set.js b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-set.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc11d2e11ed5739f86441dda0a815e1fc12b2280
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-set.js
@@ -0,0 +1,29 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Throws a TypeError if `this` is a Set object.
+info: >
+  Map.prototype.entries ( )
+
+  1. Let M be the this value.
+  2. Return CreateMapIterator(M, "key+value").
+
+  23.1.5.1 CreateMapIterator Abstract Operation
+
+  ...
+  2. If map does not have a [[MapData]] internal slot, throw a TypeError
+  exception.
+  ...
+features: [Set]
+---*/
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(new Set());
+});
+
+assert.throws(TypeError, function() {
+  var m = new Map();
+  m.entries.call(new Set());
+});
diff --git a/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-weakmap.js b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-weakmap.js
new file mode 100644
index 0000000000000000000000000000000000000000..57a7a03113453943dac9ecdd978b2403ecf89b2d
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot-weakmap.js
@@ -0,0 +1,29 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Throws a TypeError if `this` is a WeakMap object.
+info: >
+  Map.prototype.entries ( )
+
+  1. Let M be the this value.
+  2. Return CreateMapIterator(M, "key+value").
+
+  23.1.5.1 CreateMapIterator Abstract Operation
+
+  ...
+  2. If map does not have a [[MapData]] internal slot, throw a TypeError
+  exception.
+  ...
+features: [WeakMap]
+---*/
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(new WeakMap());
+});
+
+assert.throws(TypeError, function() {
+  var m = new Map();
+  m.entries.call(new WeakMap());
+});
diff --git a/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot.js b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot.js
new file mode 100644
index 0000000000000000000000000000000000000000..2ecb0de14c527d998ccb0b25929b059bfff60b03
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/does-not-have-mapdata-internal-slot.js
@@ -0,0 +1,38 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Throws a TypeError if `this` object does not have a [[MapData]] internal slot.
+info: >
+  Map.prototype.entries ( )
+
+  1. Let M be the this value.
+  2. Return CreateMapIterator(M, "key+value").
+
+  23.1.5.1 CreateMapIterator Abstract Operation
+
+  ...
+  2. If map does not have a [[MapData]] internal slot, throw a TypeError
+  exception.
+  ...
+
+---*/
+
+var m = new Map();
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call([]);
+});
+
+assert.throws(TypeError, function() {
+  m.entries.call([]);
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call({});
+});
+
+assert.throws(TypeError, function() {
+  m.entries.call({});
+});
diff --git a/test/built-ins/Map/prototype/entries/entries.js b/test/built-ins/Map/prototype/entries/entries.js
new file mode 100644
index 0000000000000000000000000000000000000000..853b1f96dc30db2c166df1c7b002a6a124512480
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/entries.js
@@ -0,0 +1,22 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Property type and descriptor.
+info: >
+  Map.prototype.entries ( )
+
+  17 ECMAScript Standard Built-in Objects
+includes: [propertyHelper.js]
+---*/
+
+assert.sameValue(
+  typeof Map.prototype.entries,
+  'function',
+  '`typeof Map.prototype.entries` is `function`'
+);
+
+verifyNotEnumerable(Map.prototype, 'entries');
+verifyWritable(Map.prototype, 'entries');
+verifyConfigurable(Map.prototype, 'entries');
diff --git a/test/built-ins/Map/prototype/entries/length.js b/test/built-ins/Map/prototype/entries/length.js
new file mode 100644
index 0000000000000000000000000000000000000000..fef6c7f47387485744534b52e45b0da5d31eee6f
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/length.js
@@ -0,0 +1,22 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Map.prototype.entries.length value and descriptor.
+info: >
+  Map.prototype.entries ( )
+
+  17 ECMAScript Standard Built-in Objects
+
+includes: [propertyHelper.js]
+---*/
+
+assert.sameValue(
+  Map.prototype.entries.length, 0,
+  'The value of `Map.prototype.entries.length` is `0`'
+);
+
+verifyNotEnumerable(Map.prototype.entries, 'length');
+verifyNotWritable(Map.prototype.entries, 'length');
+verifyConfigurable(Map.prototype.entries, 'length');
diff --git a/test/built-ins/Map/prototype/entries/name.js b/test/built-ins/Map/prototype/entries/name.js
new file mode 100644
index 0000000000000000000000000000000000000000..f80d0380904ae5ce64d3558ac437c50a52c9f94c
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/name.js
@@ -0,0 +1,22 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Map.prototype.entries.name value and descriptor.
+info: >
+  Map.prototype.entries ( )
+
+  17 ECMAScript Standard Built-in Objects
+
+includes: [propertyHelper.js]
+---*/
+
+assert.sameValue(
+  Map.prototype.entries.name, 'entries',
+  'The value of `Map.prototype.entries.name` is `"entries"`'
+);
+
+verifyNotEnumerable(Map.prototype.entries, 'name');
+verifyNotWritable(Map.prototype.entries, 'name');
+verifyConfigurable(Map.prototype.entries, 'name');
diff --git a/test/built-ins/Map/prototype/entries/returns-iterator-empty.js b/test/built-ins/Map/prototype/entries/returns-iterator-empty.js
new file mode 100644
index 0000000000000000000000000000000000000000..2584d4d5ca818f96b711239de4de0ee3ff608724
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/returns-iterator-empty.js
@@ -0,0 +1,27 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Returns an iterator on an empty Map object.
+info: >
+  Map.prototype.entries ( )
+
+  ...
+  2. Return CreateMapIterator(M, "key+value").
+
+  23.1.5.1 CreateMapIterator Abstract Operation
+
+  ...
+  7. Return iterator.
+---*/
+
+var map = new Map();
+var iterator = map.entries();
+var result = iterator.next();
+
+assert.sameValue(
+  result.value, undefined,
+  'The value of `result.value` is `undefined`'
+);
+assert.sameValue(result.done, true, 'The value of `result.done` is `true`');
diff --git a/test/built-ins/Map/prototype/entries/returns-iterator.js b/test/built-ins/Map/prototype/entries/returns-iterator.js
new file mode 100644
index 0000000000000000000000000000000000000000..5e6ad2b2e317b580250d008b0fcd1c4979b12266
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/returns-iterator.js
@@ -0,0 +1,55 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Returns an iterator.
+info: >
+  Map.prototype.entries ( )
+
+  ...
+  2. Return CreateMapIterator(M, "key+value").
+
+  23.1.5.1 CreateMapIterator Abstract Operation
+
+  ...
+  7. Return iterator.
+---*/
+
+var map = new Map();
+map.set('a',1);
+map.set('b',2);
+map.set('c',3);
+
+var iterator = map.entries();
+var result;
+
+result = iterator.next();
+assert.sameValue(result.value[0], 'a', 'First result `value` ("key")');
+assert.sameValue(result.value[1], 1, 'First result `value` ("value")');
+assert.sameValue(result.value.length, 2, 'First result `value` (length)');
+assert.sameValue(result.done, false, 'First result `done` flag');
+
+result = iterator.next();
+assert.sameValue(result.value[0], 'b', 'Second result `value` ("key")');
+assert.sameValue(result.value[1], 2, 'Second result `value` ("value")');
+assert.sameValue(result.value.length, 2, 'Second result `value` (length)');
+assert.sameValue(result.done, false, 'Second result `done` flag');
+
+result = iterator.next();
+assert.sameValue(result.value[0], 'c', 'Third result `value` ("key")');
+assert.sameValue(result.value[1], 3, 'Third result `value` ("value")');
+assert.sameValue(result.value.length, 2, 'Third result `value` (length)');
+assert.sameValue(result.done, false, 'Third result `done` flag');
+
+result = iterator.next();
+assert.sameValue(result.value, undefined, 'Exhausted result `value`');
+assert.sameValue(result.done, true, 'Exhausted result `done` flag');
+
+result = iterator.next();
+assert.sameValue(
+  result.value, undefined, 'Exhausted result `value` (repeated request)'
+);
+assert.sameValue(
+  result.done, true, 'Exhausted result `done` flag (repeated request)'
+);
diff --git a/test/built-ins/Map/prototype/entries/this-not-object-throw.js b/test/built-ins/Map/prototype/entries/this-not-object-throw.js
new file mode 100644
index 0000000000000000000000000000000000000000..6e5d56213bd39072bf1a6cadcaf426e3404674dd
--- /dev/null
+++ b/test/built-ins/Map/prototype/entries/this-not-object-throw.js
@@ -0,0 +1,47 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.3.4
+description: >
+  Throws a TypeError if `this` is not an Object.
+info: >
+  Map.prototype.entries ( )
+
+  ...
+  2. Return CreateSetIterator(M, "key+value").
+
+  23.1.5.1 CreateSetIterator Abstract Operation
+
+  1. If Type(map) is not Object, throw a TypeError exception.
+  ...
+features: [Symbol]
+---*/
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(false);
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(1);
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call('');
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(undefined);
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(null);
+});
+
+assert.throws(TypeError, function() {
+  Map.prototype.entries.call(Symbol());
+});
+
+assert.throws(TypeError, function() {
+  var map = new Map();
+  map.entries.call(false);
+});