diff --git a/test/built-ins/Map/prototype/entries-iteration.js b/test/built-ins/Map/prototype/entries-iteration.js
deleted file mode 100644
index 72b605101077781a0ee60aa12473676c4bc3431a..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/entries-iteration.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      The method should return a valid iterator with the context as the
-      IteratedObject.
-  es6id: 23.1.3.4
- ---*/
-
-var map = new Map();
-map.set(1, 11);
-map.set(2, 22);
-map.set(3, 33);
-
-var iterator = map.entries();
-var result;
-
-result = iterator.next();
-assert.sameValue(result.value[0], 1, 'First result `value` (map key)');
-assert.sameValue(result.value[1], 11, 'First result `value` (map 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], 2, 'Second result `value` (map key)');
-assert.sameValue(result.value[1], 22, 'Second result `value` (map 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], 3, 'Third result `value` (map key)');
-assert.sameValue(result.value[1], 33, 'Third result `value` (map 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-no-map-data.js b/test/built-ins/Map/prototype/entries-no-map-data.js
deleted file mode 100644
index 30d1f494cc3f25ddb0695b396a332861fe2b2ab2..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/entries-no-map-data.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      If the context does not have a [[MapData]] internal slot, throw a
-      TypeError exception as per 23.1.5.1.
-  es6id: 23.1.3.4
- ---*/
-
-assert.throws(TypeError, function() {
-  Map.prototype.entries.call({});
-});
diff --git a/test/built-ins/Map/prototype/keys-iteration.js b/test/built-ins/Map/prototype/keys-iteration.js
deleted file mode 100644
index 5d0bd671bfb654798dbbd0e4b0a4b0bd89c21b50..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/keys-iteration.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      The method should return a valid iterator with the context as the
-      IteratedObject.
-  es6id: 23.1.3.8
- ---*/
-
-var map = new Map();
-map.set(1, 11);
-map.set(2, 22);
-map.set(3, 33);
-
-var iterator = map.keys();
-var result;
-
-result = iterator.next();
-assert.sameValue(result.value, 1, 'First result `value`');
-assert.sameValue(result.done, false, 'First result `done` flag');
-
-result = iterator.next();
-assert.sameValue(result.value, 2, 'Second result `value`');
-assert.sameValue(result.done, false, 'Second result `done` flag');
-
-result = iterator.next();
-assert.sameValue(result.value, 3, 'Third result `value`');
-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/keys-no-map-data.js b/test/built-ins/Map/prototype/keys-no-map-data.js
deleted file mode 100644
index f026c9f152376a73cda9fc4b44668ab80eac2115..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/keys-no-map-data.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      If the context does not have a [[MapData]] internal slot, throw a
-      TypeError exception as per 23.1.5.1.
-  es6id: 23.1.3.8
- ---*/
-
-assert.throws(TypeError, function() {
-  Map.prototype.keys.call({});
-});
diff --git a/test/built-ins/Map/prototype/values-iteration-mutable.js b/test/built-ins/Map/prototype/values-iteration-mutable.js
deleted file mode 100644
index 40d8cca525d3aeef7d1935b6875a7b55c812e0a8..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/values-iteration-mutable.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      When an item is added to the map after the iterator is created but before
-      the iterator is "done" (as defined by 23.1.5.2.1), the new item should be
-      accessible via iteration. When an item is added to the map after the
-      iterator is "done", the new item should not be accessible via iteration.
-  es6id: 23.1.3.11
- ---*/
-
-var map = new Map();
-map.set(1, 11);
-map.set(2, 22);
-
-var iterator = map.values();
-var result;
-
-result = iterator.next();
-assert.sameValue(result.value, 11, 'First result `value`');
-assert.sameValue(result.done, false, 'First result `done` flag');
-
-map.set(3, 33);
-
-result = iterator.next();
-assert.sameValue(result.value, 22, 'Second result `value`');
-assert.sameValue(result.done, false, 'Second result `done` flag');
-
-result = iterator.next();
-assert.sameValue(result.value, 33, 'Third result `value`');
-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');
-
-map.set(4, 44);
-
-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/values-iteration.js b/test/built-ins/Map/prototype/values-iteration.js
deleted file mode 100644
index 3680a036dd5c9f2f394f7d1c2042e0368e34f95f..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/values-iteration.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      The method should return a valid iterator with the context as the
-      IteratedObject.
-  es6id: 23.1.3.11
- ---*/
-
-var map = new Map();
-map.set(1, 11);
-map.set(2, 22);
-map.set(3, 33);
-
-var iterator = map.values();
-var result;
-
-result = iterator.next();
-assert.sameValue(result.value, 11, 'First result `value`');
-assert.sameValue(result.done, false, 'First result `done` flag');
-
-result = iterator.next();
-assert.sameValue(result.value, 22, 'Second result `value`');
-assert.sameValue(result.done, false, 'Second result `done` flag');
-
-result = iterator.next();
-assert.sameValue(result.value, 33, 'Third result `value`');
-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/values-no-map-data.js b/test/built-ins/Map/prototype/values-no-map-data.js
deleted file mode 100644
index ccc666ee15d00cf27306f76e9711923098b0bbb7..0000000000000000000000000000000000000000
--- a/test/built-ins/Map/prototype/values-no-map-data.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-  description: >
-      If the context does not have a [[MapData]] internal slot, throw a
-      TypeError exception as per 23.1.5.1.
-  es6id: 23.1.3.4
- ---*/
-
-assert.throws(TypeError, function() {
-  Map.prototype.values.call({});
-});