diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-global.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-global.js
deleted file mode 100644
index 86ac657df88d02cdf438ea213121c014f966f6af..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-global.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Type coercion of `global` property value
-es6id: 21.2.5.6
-info: >
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.1 Runtime Semantics: RegExpExec ( R, S )
-
-    [...]
-    7. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    6. Let global be ToBoolean(Get(R, "global")).
-features: [Symbol.match]
----*/
-
-var r = /./;
-var val, result;
-Object.defineProperty(r, 'global', {
-  get: function() {
-    return val;
-  }
-});
-
-val = false;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-assert.sameValue(result[0], 'a');
-
-val = '';
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-assert.sameValue(result[0], 'a');
-
-val = 0;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-assert.sameValue(result[0], 'a');
-
-val = null;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-assert.sameValue(result[0], 'a');
-
-val = undefined;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-assert.sameValue(result[0], 'a');
-
-val = true;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
-assert.sameValue(result[0], 'a');
-assert.sameValue(result[1], 'b');
-
-val = 'truthy';
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
-assert.sameValue(result[0], 'a');
-assert.sameValue(result[1], 'b');
-
-val = 86;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
-assert.sameValue(result[0], 'a');
-assert.sameValue(result[1], 'b');
-
-val = [];
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
-assert.sameValue(result[0], 'a');
-assert.sameValue(result[1], 'b');
-
-val = Symbol.match;
-result = r[Symbol.match]('ab');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
-assert.sameValue(result[0], 'a');
-assert.sameValue(result[1], 'b');
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-sticky.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-sticky.js
deleted file mode 100644
index 0f6a28edf70a1edd54fdbd56f7e83e0e3f0c1635..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-coerce-sticky.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Type coercion of `sticky` property value
-es6id: 21.2.5.6
-info: >
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.1 Runtime Semantics: RegExpExec ( R, S )
-
-    [...]
-    7. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    [...]
-    18. If global is true or sticky is true,
-        a. Let setStatus be Set(R, "lastIndex", e, true).
-features: [Symbol.match]
----*/
-
-var r = /./;
-var val;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    return val;
-  }
-});
-
-val = false;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 0, 'literal false');
-
-val = '';
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 0, 'empty string');
-
-val = 0;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 0, 'zero');
-
-val = null;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 0, 'null');
-
-val = undefined;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 0, 'undefined');
-
-val = true;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 1, 'literal true');
-
-r.lastIndex = 0;
-val = 'truthy';
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 1, 'non-empty string');
-
-r.lastIndex = 0;
-val = 86;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 1, 'nonzero number');
-
-r.lastIndex = 0;
-val = [];
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 1, 'array');
-
-r.lastIndex = 0;
-val = Symbol.match;
-r[Symbol.match]('a');
-assert.sameValue(r.lastIndex, 1, 'symbol');
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-global-err.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-global-err.js
deleted file mode 100644
index 508560d977d1900b922d454bfe7ac350bc1a9d45..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-global-err.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior when error thrown by accessing the `global` property
-es6id: 21.2.5.6
-info: >
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.1 Runtime Semantics: RegExpExec ( R, S )
-
-    [...]
-    7. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    6. Let global be ToBoolean(Get(R, "global")).
-    7. ReturnIfAbrupt(global).
-features: [Symbol.match]
----*/
-
-var r = /./;
-var callCount = 0;
-Object.defineProperty(r, 'global', {
-  get: function() {
-    callCount += 1;
-
-    if (callCount > 1) {
-      throw new Test262Error();
-    }
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r[Symbol.match]('');
-});
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-sticky-err.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-sticky-err.js
deleted file mode 100644
index 4b1efa9f4110147142559c5fb4d34d57932719ac..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-get-sticky-err.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior when error thrown by accessing the `sticky` property
-es6id: 21.2.5.6
-info: >
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.1 Runtime Semantics: RegExpExec ( R, S )
-
-    [...]
-    7. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
-features: [Symbol.match]
----*/
-
-var r = /./;
-var shouldThrow = false;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r[Symbol.match]('');
-});
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex-err.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex-err.js
index 036eed90ea30c7eb726572cbc914528d95b38da1..c3b0e428b46b3ea1ede057926bc1df907b13fdd5 100644
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex-err.js
+++ b/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex-err.js
@@ -27,14 +27,23 @@ info: >
 features: [Symbol.match]
 ---*/
 
-var r = /b/;
+var r = /b/g;
 var callCount = 0;
 
-Object.defineProperty(r, 'lastIndex', { writable: false });
-Object.defineProperty(r, 'global', {
+// Because this test speicifically concerns the behavior when setting
+// "lastIndex" following a match, care must be taken to avoid triggering a
+// similar error when `lastIndex` is initially set to `0` earlier in the
+// algorithm.
+//
+// Because the `lastIndex` property is non-configurable, this cannot be
+// accomplished with a simple "set" accessor function.
+//
+// Defer disabling modification of `lastIndex` until after the "this" value's
+// `exec` property has been accessed, ensuring that the resultant abrupt
+// completion originates  from the second property modification.
+Object.defineProperty(r, 'exec', {
   get: function() {
-    callCount += 1;
-    return callCount > 1;
+    Object.defineProperty(r, 'lastIndex', { writable: false });
   }
 });
 
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex.js b/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex.js
index 9e95de64e4dbbb73b3598e509b2cf3f29731d715..8e57ab0b8ceefee9f0fbb1b2bcdc5848a856025e 100644
--- a/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex.js
+++ b/test/built-ins/RegExp/prototype/Symbol.match/builtin-success-g-set-lastindex.js
@@ -3,7 +3,7 @@
 
 /*---
 description: Setting `lastIndex` after a "global" match success
-es6id: 21.2.5.6
+esid: sec-regexp.prototype-@@match
 info: >
     [...]
     5. Let global be ToBoolean(Get(rx, "global")).
@@ -18,6 +18,9 @@ info: >
 
     21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
 
+    [...]
+    5. Let flags be the value of R's [[OriginalFlags]] internal slot.
+    6. If flags contains "g", let global be true, else let global be false.
     [...]
     16. Let e be r's endIndex value.
     [...]
@@ -26,15 +29,10 @@ info: >
 features: [Symbol.match]
 ---*/
 
-var r = /b/;
-var callCount = 0;
-
-Object.defineProperty(r, 'global', {
-  get: function() {
-    callCount += 1;
-    return callCount > 1;
-  }
-});
+// The conflicting values for the "global" flag are necessary to observe the
+// final modification of `lastIndex` in RegExpBuiltinExec
+var r = /b/g;
+Object.defineProperty(r, 'global', { value: false });
 
 r[Symbol.match]('abc');
 
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/coerce-global.js b/test/built-ins/RegExp/prototype/Symbol.match/coerce-global.js
index ff6658a3c20fd3d2651acf9852612ab2ce1c5f31..e7ca0d6b2e86b1cc4a352532c9e9eb97b1f5bd5a 100644
--- a/test/built-ins/RegExp/prototype/Symbol.match/coerce-global.js
+++ b/test/built-ins/RegExp/prototype/Symbol.match/coerce-global.js
@@ -3,66 +3,83 @@
 
 /*---
 description: Boolean coercion of `global` property
-es6id: 21.2.5.6
+esid: sec-regexp.prototype-@@match
 info: >
     21.2.5.6 RegExp.prototype [ @@match ] ( string )
 
     [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    [...]
+    4. Let global be ToBoolean(? Get(rx, "global")).
+    5. If global is false, then
+       a. Return ? RegExpExec(rx, S).
+    6. Else global is true,
+       a. Let fullUnicode be ToBoolean(? Get(rx, "unicode")).
+       [...]
 features: [Symbol.match]
 ---*/
 
-var r = /a/;
-var result;
+var exec = function() {
+  execCount += 1;
+  if (execCount === 1) {
+    return [''];
+  }
+  return null;
+};
+var r, result, execCount;
+
+r = /a/g;
+r.exec = exec;
 Object.defineProperty(r, 'global', { writable: true });
 
+execCount = 0;
 r.global = undefined;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: undefined');
 
+execCount = 0;
 r.global = null;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
-
-r.global = true;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.notSameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: null');
 
+execCount = 0;
 r.global = false;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: false');
 
+execCount = 0;
 r.global = NaN;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: NaN');
 
+execCount = 0;
 r.global = 0;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: 0');
 
+execCount = 0;
 r.global = '';
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 1);
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 1, 'value: ""');
+
+r = /a/;
+r.exec = exec;
+Object.defineProperty(r, 'global', { writable: true });
+
+r.global = true;
+execCount = 0;
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 2, 'value: true');
 
 r.global = 86;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
+execCount = 0;
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 2, 'value: 86');
 
 r.global = Symbol.match;
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
+execCount = 0;
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 2, 'value: Symbol.match');
 
 r.global = {};
-result = r[Symbol.match]('aa');
-assert.notSameValue(result, null);
-assert.sameValue(result.length, 2);
+execCount = 0;
+r[Symbol.match]('aa');
+assert.sameValue(execCount, 2, 'value: {}');
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/coerce-sticky.js b/test/built-ins/RegExp/prototype/Symbol.match/coerce-sticky.js
deleted file mode 100644
index a171141603141282bea19019b7a60d430f774324..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/coerce-sticky.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Boolean coercion of `sticky` property
-es6id: 21.2.5.6
-info: >
-    21.2.5.6 RegExp.prototype [ @@match ] ( string )
-
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-features: [Symbol.match]
----*/
-
-var r = /a/;
-Object.defineProperty(r, 'sticky', { writable: true });
-
-r.sticky = undefined;
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = null;
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = true;
-assert.sameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = false;
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = NaN;
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = 0;
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = '';
-assert.notSameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = 86;
-assert.sameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = Symbol.match;
-assert.sameValue(r[Symbol.match]('ba'), null);
-
-r.sticky = {};
-assert.sameValue(r[Symbol.match]('ba'), null);
diff --git a/test/built-ins/RegExp/prototype/Symbol.match/get-sticky-err.js b/test/built-ins/RegExp/prototype/Symbol.match/get-sticky-err.js
deleted file mode 100644
index 76c81f5accc7c215296150fde6c51a1550259949..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.match/get-sticky-err.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior if error is thrown when accessing `sticky` property
-es6id: 21.2.5.6
-info: >
-    21.2.5.6 RegExp.prototype [ @@match ] ( string )
-
-    [...]
-    5. Let global be ToBoolean(Get(rx, "global")).
-    6. ReturnIfAbrupt(global).
-    7. If global is false, then
-       a. Return RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
-features: [Symbol.match]
----*/
-
-var r = /./;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r[Symbol.match]();
-});
diff --git a/test/built-ins/RegExp/prototype/Symbol.replace/coerce-global.js b/test/built-ins/RegExp/prototype/Symbol.replace/coerce-global.js
index c9467aec91d5291548c15d6880ead19d484744c1..d4e646140f9722742171f77a0f525f9a94db3a18 100644
--- a/test/built-ins/RegExp/prototype/Symbol.replace/coerce-global.js
+++ b/test/built-ins/RegExp/prototype/Symbol.replace/coerce-global.js
@@ -13,35 +13,61 @@ info: >
 features: [Symbol.replace]
 ---*/
 
-var r = /a/;
+Array.print = print;
+var r = /a/g;
 Object.defineProperty(r, 'global', { writable: true });
 
+r.lastIndex = 0;
 r.global = undefined;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: undefined');
 
+r.lastIndex = 0;
 r.global = null;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: null');
 
+r.lastIndex = 0;
 r.global = false;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: false');
 
+r.lastIndex = 0;
 r.global = NaN;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: NaN');
 
+r.lastIndex = 0;
 r.global = 0;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: global');
 
+r.lastIndex = 0;
 r.global = '';
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba');
+assert.sameValue(r[Symbol.replace]('aa', 'b'), 'ba', 'value: ""');
 
+var execCount = 0;
+r = /a/;
+Object.defineProperty(r, 'global', { writable: true });
+r.exec = function() {
+  execCount += 1;
+  if (execCount === 1) {
+    return ['a'];
+  }
+  return null;
+};
+
+execCount = 0;
 r.global = true;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'bb');
+r[Symbol.replace]('aa', 'b');
+assert.sameValue(execCount, 2, 'value: true');
 
+execCount = 0;
 r.global = 86;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'bb');
+r[Symbol.replace]('aa', 'b');
+assert.sameValue(execCount, 2, 'value: 86');
 
+execCount = 0;
 r.global = Symbol.replace;
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'bb');
+r[Symbol.replace]('aa', 'b');
+assert.sameValue(execCount, 2, 'value: Symbol.replace');
 
+execCount = 0;
 r.global = {};
-assert.sameValue(r[Symbol.replace]('aa', 'b'), 'bb');
+r[Symbol.replace]('aa', 'b');
+assert.sameValue(execCount, 2, 'value: {}');
diff --git a/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-coerce.js b/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-coerce.js
deleted file mode 100644
index e006e5df7ade61f95a5422232973320b809b893d..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-coerce.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Boolean coercion of `sticky` property
-es6id: 21.2.5.8
-info: >
-    21.2.5.8 RegExp.prototype [ @@replace ] ( string, replaceValue )
-
-    [...]
-    13. Repeat, while done is false
-        a. Let result be RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
-features: [Symbol.replace]
----*/
-
-var r = /a/;
-Object.defineProperty(r, 'sticky', { writable: true });
-
-r.sticky = undefined;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = null;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = true;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'ba');
-
-r.sticky = false;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = NaN;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = 0;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = 86;
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'ba');
-
-r.sticky = '';
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'bx');
-
-r.sticky = Symbol();
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'ba');
-
-r.sticky = {};
-assert.sameValue(r[Symbol.replace]('ba', 'x'), 'ba');
diff --git a/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-err.js b/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-err.js
deleted file mode 100644
index bda454e1acce0fe61b2196fccbf5312c839f5a32..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.replace/get-sticky-err.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior if error is thrown when accessing `sticky` property
-es6id: 21.2.5.8
-info: >
-    21.2.5.8 RegExp.prototype [ @@replace ] ( string, replaceValue )
-
-    [...]
-    13. Repeat, while done is false
-        a. Let result be RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
-features: [Symbol.replace]
----*/
-
-var r = /./;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r[Symbol.replace]();
-});
diff --git a/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-coerce.js b/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-coerce.js
deleted file mode 100644
index 044b9198a9d21a435d4f6b1c824b8af58f2a9b44..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-coerce.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Boolean coercion of `sticky` property
-es6id: 21.2.5.9
-info: >
-    21.2.5.9 RegExp.prototype [ @@search ] ( string )
-
-    [...]
-    9. Let result be RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    4. Let lastIndex be ToLength(Get(R,"lastIndex")).
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    [...]
-features: [Symbol, Symbol.search]
----*/
-
-var r = /a/;
-Object.defineProperty(r, 'sticky', { writable: true });
-
-r.sticky = undefined;
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = null;
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = true;
-assert.sameValue(r[Symbol.search]('ba'), -1);
-
-r.sticky = false;
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = NaN;
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = 0;
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = 86;
-assert.sameValue(r[Symbol.search]('ba'), -1);
-
-r.sticky = '';
-assert.sameValue(r[Symbol.search]('ba'), 1);
-
-r.sticky = Symbol();
-assert.sameValue(r[Symbol.search]('ba'), -1);
-
-r.sticky = {};
-assert.sameValue(r[Symbol.search]('ba'), -1);
diff --git a/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-err.js b/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-err.js
deleted file mode 100644
index b845e2025027cf89ab1f8bf3118647271602aaea..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/Symbol.search/get-sticky-err.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior if error is thrown when accessing `sticky` property
-es6id: 21.2.5.9
-info: >
-    21.2.5.9 RegExp.prototype [ @@search ] ( string )
-
-    [...]
-    9. Let result be RegExpExec(rx, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
-features: [Symbol.search]
----*/
-
-var r = /./;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r[Symbol.search]();
-});
diff --git a/test/built-ins/RegExp/prototype/exec/get-sticky-coerce.js b/test/built-ins/RegExp/prototype/exec/get-sticky-coerce.js
deleted file mode 100644
index 31cebed02788ac4194c043335f634215f90b85c0..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/exec/get-sticky-coerce.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Boolean coercion of `sticky` property
-es6id: 21.2.5.2
-info: >
-    21.2.5.2 RegExp.prototype.exec ( string )
-
-    [...]
-    6. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    [...]
-features: [Symbol]
----*/
-
-var r = /a/;
-Object.defineProperty(r, 'sticky', { writable: true });
-
-r.sticky = undefined;
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = null;
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = true;
-assert.sameValue(r.exec('ba'), null);
-
-r.sticky = false;
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = NaN;
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = 0;
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = 86;
-assert.sameValue(r.exec('ba'), null);
-
-r.sticky = '';
-assert.notSameValue(r.exec('ba'), null);
-
-r.sticky = Symbol();
-assert.sameValue(r.exec('ba'), null);
-
-r.sticky = {};
-assert.sameValue(r.exec('ba'), null);
diff --git a/test/built-ins/RegExp/prototype/exec/get-sticky-err.js b/test/built-ins/RegExp/prototype/exec/get-sticky-err.js
deleted file mode 100644
index 43e4a8ddd084566fa31daec262bdddac548d71c7..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/exec/get-sticky-err.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior if error is thrown when accessing `sticky` property
-es6id: 21.2.5.2
-info: >
-    21.2.5.2 RegExp.prototype.exec ( string )
-
-    [...]
-    6. Return RegExpBuiltinExec(R, S).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
----*/
-
-var r = /./;
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r.exec();
-});
diff --git a/test/built-ins/RegExp/prototype/test/get-sticky-err.js b/test/built-ins/RegExp/prototype/test/get-sticky-err.js
deleted file mode 100644
index 3f6d3f0c79d9271cb4809e7362989658ed919e9a..0000000000000000000000000000000000000000
--- a/test/built-ins/RegExp/prototype/test/get-sticky-err.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2015 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Behavior if error is thrown when accessing `sticky` property
-es6id: 21.2.5.13
-info: >
-    21.2.5.13 RegExp.prototype.test( S )
-
-    [...]
-    5. Let match be RegExpExec(R, string).
-
-    21.2.5.2.2 Runtime Semantics: RegExpBuiltinExec ( R, S )
-
-    [...]
-    8. Let sticky be ToBoolean(Get(R, "sticky")).
-    9. ReturnIfAbrupt(sticky).
----*/
-
-var r = /./;
-
-Object.defineProperty(r, 'sticky', {
-  get: function() {
-    throw new Test262Error();
-  }
-});
-
-assert.throws(Test262Error, function() {
-  r.test();
-});