diff --git a/test/annexB/built-ins/RegExp/match-indices/indices-groups-object.js b/test/annexB/built-ins/RegExp/match-indices/indices-groups-object.js
deleted file mode 100644
index 80c16c8b41..0000000000
--- a/test/annexB/built-ins/RegExp/match-indices/indices-groups-object.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2019 Ron Buckton. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: The groups object of indices is created with CreateDataProperty
-includes: [compareArray.js]
-esid: sec-makeindicesarray
-features: [regexp-named-groups, regexp-match-indices]
-info: |
-  MakeIndicesArray ( S, indices, groupNames )
-    8. If _groupNames_ is not *undefined*, then
-      a. Let _groups_ be ! ObjectCreate(*null*).
-    9. Else,
-      a. Let _groups_ be *undefined*.
-    10. Perform ! CreateDataProperty(_A_, `"groups"`, _groups_).
----*/
-
-// The `__proto__` property on the groups object is not special,
-// and does not affect the [[Prototype]] of the resulting groups object.
-let {groups} = /(?<__proto__>.)/.exec("a").indices;
-assert.compareArray([0, 1], groups.__proto__);
-assert.sameValue(null, Object.getPrototypeOf(groups));
diff --git a/test/annexB/built-ins/RegExp/named-groups/groups-object.js b/test/annexB/built-ins/RegExp/named-groups/groups-object.js
deleted file mode 100644
index 80eb0cd27f..0000000000
--- a/test/annexB/built-ins/RegExp/named-groups/groups-object.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 Aleksey Shvayka. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-description: Properties of the groups object are created with CreateDataProperty
-esid: sec-regexpbuiltinexec
-features: [regexp-named-groups]
-info: |
-  Runtime Semantics: RegExpBuiltinExec ( R, S )
-    24. If _R_ contains any |GroupName|, then
-      a. Let _groups_ be ObjectCreate(*null*).
-    25. Else,
-      a. Let _groups_ be *undefined*.
-    26. Perform ! CreateDataProperty(_A_, `"groups"`, _groups_).
----*/
-
-// The `__proto__` property on the groups object is not special,
-// and does not affect the [[Prototype]] of the resulting groups object.
-let {groups} = /(?<__proto__>.)/.exec("a");
-assert.sameValue("a", groups.__proto__);
-assert.sameValue(null, Object.getPrototypeOf(groups));
diff --git a/test/annexB/built-ins/JSON/parse/S15.12.2_A1.js b/test/built-ins/JSON/parse/S15.12.2_A1.js
similarity index 100%
rename from test/annexB/built-ins/JSON/parse/S15.12.2_A1.js
rename to test/built-ins/JSON/parse/S15.12.2_A1.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/get-abrupt.js b/test/built-ins/Object/prototype/__proto__/get-abrupt.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/get-abrupt.js
rename to test/built-ins/Object/prototype/__proto__/get-abrupt.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/get-fn-name.js b/test/built-ins/Object/prototype/__proto__/get-fn-name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/get-fn-name.js
rename to test/built-ins/Object/prototype/__proto__/get-fn-name.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/get-ordinary-obj.js b/test/built-ins/Object/prototype/__proto__/get-ordinary-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/get-ordinary-obj.js
rename to test/built-ins/Object/prototype/__proto__/get-ordinary-obj.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/get-to-obj-abrupt.js b/test/built-ins/Object/prototype/__proto__/get-to-obj-abrupt.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/get-to-obj-abrupt.js
rename to test/built-ins/Object/prototype/__proto__/get-to-obj-abrupt.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/prop-desc.js b/test/built-ins/Object/prototype/__proto__/prop-desc.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/prop-desc.js
rename to test/built-ins/Object/prototype/__proto__/prop-desc.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-abrupt.js b/test/built-ins/Object/prototype/__proto__/set-abrupt.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-abrupt.js
rename to test/built-ins/Object/prototype/__proto__/set-abrupt.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-cycle-shadowed.js b/test/built-ins/Object/prototype/__proto__/set-cycle-shadowed.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-cycle-shadowed.js
rename to test/built-ins/Object/prototype/__proto__/set-cycle-shadowed.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-cycle.js b/test/built-ins/Object/prototype/__proto__/set-cycle.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-cycle.js
rename to test/built-ins/Object/prototype/__proto__/set-cycle.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-fn-name.js b/test/built-ins/Object/prototype/__proto__/set-fn-name.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-fn-name.js
rename to test/built-ins/Object/prototype/__proto__/set-fn-name.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-immutable.js b/test/built-ins/Object/prototype/__proto__/set-immutable.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-immutable.js
rename to test/built-ins/Object/prototype/__proto__/set-immutable.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-invalid-value.js b/test/built-ins/Object/prototype/__proto__/set-invalid-value.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-invalid-value.js
rename to test/built-ins/Object/prototype/__proto__/set-invalid-value.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-non-extensible.js b/test/built-ins/Object/prototype/__proto__/set-non-extensible.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-non-extensible.js
rename to test/built-ins/Object/prototype/__proto__/set-non-extensible.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-non-obj-coercible.js b/test/built-ins/Object/prototype/__proto__/set-non-obj-coercible.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-non-obj-coercible.js
rename to test/built-ins/Object/prototype/__proto__/set-non-obj-coercible.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-non-object.js b/test/built-ins/Object/prototype/__proto__/set-non-object.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-non-object.js
rename to test/built-ins/Object/prototype/__proto__/set-non-object.js
diff --git a/test/annexB/built-ins/Object/prototype/__proto__/set-ordinary-obj.js b/test/built-ins/Object/prototype/__proto__/set-ordinary-obj.js
similarity index 100%
rename from test/annexB/built-ins/Object/prototype/__proto__/set-ordinary-obj.js
rename to test/built-ins/Object/prototype/__proto__/set-ordinary-obj.js
diff --git a/test/annexB/built-ins/Proxy/set/call-parameters-prototype-dunder-proto.js b/test/built-ins/Proxy/set/call-parameters-prototype-dunder-proto.js
similarity index 100%
rename from test/annexB/built-ins/Proxy/set/call-parameters-prototype-dunder-proto.js
rename to test/built-ins/Proxy/set/call-parameters-prototype-dunder-proto.js
diff --git a/test/built-ins/RegExp/match-indices/indices-groups-object.js b/test/built-ins/RegExp/match-indices/indices-groups-object.js
index 7bd448d035..80c16c8b41 100644
--- a/test/built-ins/RegExp/match-indices/indices-groups-object.js
+++ b/test/built-ins/RegExp/match-indices/indices-groups-object.js
@@ -3,7 +3,7 @@
 
 /*---
 description: The groups object of indices is created with CreateDataProperty
-includes: [propertyHelper.js]
+includes: [compareArray.js]
 esid: sec-makeindicesarray
 features: [regexp-named-groups, regexp-match-indices]
 info: |
@@ -15,20 +15,8 @@ info: |
     10. Perform ! CreateDataProperty(_A_, `"groups"`, _groups_).
 ---*/
 
-
-// `groups` is created with Define, not Set.
-let counter = 0;
-Object.defineProperty(Array.prototype, "groups", {
-  set() { counter++; }
-});
-
-let indices = /(?<x>.)/.exec("a").indices;
-assert.sameValue(counter, 0);
-
-// `groups` is writable, enumerable and configurable
-// (from CreateDataProperty).
-verifyProperty(indices, 'groups', {
-    writable: true,
-    enumerable: true,
-    configurable: true
-});
+// The `__proto__` property on the groups object is not special,
+// and does not affect the [[Prototype]] of the resulting groups object.
+let {groups} = /(?<__proto__>.)/.exec("a").indices;
+assert.compareArray([0, 1], groups.__proto__);
+assert.sameValue(null, Object.getPrototypeOf(groups));
diff --git a/test/built-ins/RegExp/named-groups/groups-object.js b/test/built-ins/RegExp/named-groups/groups-object.js
index d8ee4aff7d..80eb0cd27f 100644
--- a/test/built-ins/RegExp/named-groups/groups-object.js
+++ b/test/built-ins/RegExp/named-groups/groups-object.js
@@ -3,7 +3,6 @@
 
 /*---
 description: Properties of the groups object are created with CreateDataProperty
-includes: [propertyHelper.js]
 esid: sec-regexpbuiltinexec
 features: [regexp-named-groups]
 info: |
@@ -15,19 +14,8 @@ info: |
     26. Perform ! CreateDataProperty(_A_, `"groups"`, _groups_).
 ---*/
 
-// `groups` is created with Define, not Set.
-let counter = 0;
-Object.defineProperty(Array.prototype, "groups", {
-  set() { counter++; }
-});
-
-let match = /(?<x>.)/.exec("a");
-assert.sameValue(counter, 0);
-
-// `groups` is writable, enumerable and configurable
-// (from CreateDataProperty).
-verifyProperty(match, "groups", {
-  writable: true,
-  enumerable: true,
-  configurable: true,
-});
+// The `__proto__` property on the groups object is not special,
+// and does not affect the [[Prototype]] of the resulting groups object.
+let {groups} = /(?<__proto__>.)/.exec("a");
+assert.sameValue("a", groups.__proto__);
+assert.sameValue(null, Object.getPrototypeOf(groups));
diff --git a/test/annexB/language/expressions/object/__proto__-duplicate-computed.js b/test/language/expressions/object/__proto__-duplicate-computed.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-duplicate-computed.js
rename to test/language/expressions/object/__proto__-duplicate-computed.js
diff --git a/test/annexB/language/expressions/object/__proto__-duplicate.js b/test/language/expressions/object/__proto__-duplicate.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-duplicate.js
rename to test/language/expressions/object/__proto__-duplicate.js
diff --git a/test/annexB/language/expressions/object/__proto__-fn-name.js b/test/language/expressions/object/__proto__-fn-name.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-fn-name.js
rename to test/language/expressions/object/__proto__-fn-name.js
diff --git a/test/annexB/language/expressions/object/__proto__-poisoned-object-prototype.js b/test/language/expressions/object/__proto__-poisoned-object-prototype.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-poisoned-object-prototype.js
rename to test/language/expressions/object/__proto__-poisoned-object-prototype.js
diff --git a/test/annexB/language/expressions/object/__proto__-value-non-object.js b/test/language/expressions/object/__proto__-value-non-object.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-value-non-object.js
rename to test/language/expressions/object/__proto__-value-non-object.js
diff --git a/test/annexB/language/expressions/object/__proto__-value-null.js b/test/language/expressions/object/__proto__-value-null.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-value-null.js
rename to test/language/expressions/object/__proto__-value-null.js
diff --git a/test/annexB/language/expressions/object/__proto__-value-obj.js b/test/language/expressions/object/__proto__-value-obj.js
similarity index 100%
rename from test/annexB/language/expressions/object/__proto__-value-obj.js
rename to test/language/expressions/object/__proto__-value-obj.js