diff --git a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update-dflt.js b/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update-dflt.js
deleted file mode 100644
index 36121c7864..0000000000
--- a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update-dflt.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-description: >
-    Modifications to default binding that occur after dependency has been
-    evaluated are reflected in local binding
-info: |
-    8.1.1.5.1 GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-flags: [async, module]
-features: [dynamic-import]
----*/
-
-import('./eval-gtbndng-indirect-update-dflt_FIXTURE.js').then(imported => {
-  assert.sameValue(imported.default(), 1);
-  assert.sameValue(imported.default, 2);
-}).then($DONE, $DONE).catch($DONE);
diff --git a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update.js b/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update.js
deleted file mode 100644
index 14ce1eb0b9..0000000000
--- a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-description: >
-    Modifications to named bindings that occur after dependency has been
-    evaluated are reflected in local binding
-esid: sec-moduleevaluation
-info: |
-    8.1.1.5.1 GetBindingValue (N, S)
-
-    [...]
-    3. If the binding for N is an indirect binding, then
-       a. Let M and N2 be the indirection values provided when this binding for
-          N was created.
-       b. Let targetEnv be M.[[Environment]].
-       c. If targetEnv is undefined, throw a ReferenceError exception.
-       d. Let targetER be targetEnv's EnvironmentRecord.
-       e. Return ? targetER.GetBindingValue(N2, S).
-includes: [fnGlobalObject.js]
-flags: [async, module]
-features: [dynamic-import]
----*/
-
-import('./eval-gtbndng-indirect-update_FIXTURE.js').then(imported => {
-  assert.sameValue(imported.x, 1);
-
-  // This function is exposed on the global scope (instead of as an exported
-  // binding) in order to avoid possible false positives from assuming correct
-  // behavior of the semantics under test.
-  fnGlobalObject().test262update();
-
-  assert.sameValue(imported.x, 2);
-});
diff --git a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update-dflt_FIXTURE.js b/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-gtbndng-indirect-update-dflt_FIXTURE.js
rename to test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update-dflt_FIXTURE.js
diff --git a/test/language/module-code/dynamic-import/eval-gtbndng-indirect-update_FIXTURE.js b/test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js
similarity index 100%
rename from test/language/module-code/dynamic-import/eval-gtbndng-indirect-update_FIXTURE.js
rename to test/language/module-code/dynamic-import/usage/eval-gtbndng-indirect-update_FIXTURE.js