diff --git a/import-maps/META.yml b/import-maps/META.yml
new file mode 100644
index 00000000000000..bc6d40ec352178
--- /dev/null
+++ b/import-maps/META.yml
@@ -0,0 +1,4 @@
+spec: https://github.com/WICG/import-maps
+suggested_reviewers:
+  - domenic
+  - hiroshige-g
diff --git a/import-maps/README.md b/import-maps/README.md
deleted file mode 100644
index 3803e350c844b4..00000000000000
--- a/import-maps/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Tests for [Import Maps](https://github.com/WICG/import-maps).
-
-Because the spec itself is still under development and there are ongoing spec
-discussions, the tests are all tentative.
-
-Also, some tests are based on Chromium's behavior which reflects an older
-version of import maps spec ("package name maps" around May 2018), and have
-dependency to Chromium's implementation (internals.resolveModuleSpecifier).
-These dependencies should be removed, once the spec matures.
diff --git a/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html b/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
deleted file mode 100644
index ceef4100aad01f..00000000000000
--- a/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
-const t = async_test(
-  'After module worker creation, import maps should fire error events');
-const log = [];
-new Worker('../../resources/empty.js?pipe=trickle(d1)', {type: "module"});
-</script>
-<script type="importmap" onerror="t.done()">
-{
-  "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
-    .then(() => assert_array_equals(log, ["A"]))
-  },
-  'After module worker creation import maps are not effective');
-</script>
diff --git a/import-maps/acquiring/README.md b/import-maps/acquiring/README.md
new file mode 100644
index 00000000000000..189d19021791bf
--- /dev/null
+++ b/import-maps/acquiring/README.md
@@ -0,0 +1 @@
+These tests are about the impact of the [acquiring import maps](https://wicg.github.io/import-maps/#document-acquiring-import-maps) boolean, which prevents import maps from taking effect after a module import has started.
diff --git a/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html b/import-maps/acquiring/dynamic-import.html
similarity index 74%
rename from import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
rename to import-maps/acquiring/dynamic-import.html
index 512cd7fa6974e8..49d8a701da2e43 100644
--- a/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
+++ b/import-maps/acquiring/dynamic-import.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
 const t = async_test(
   'After dynamic imports, import maps should fire error events');
 const log = [];
@@ -12,19 +11,19 @@
 // first attempt to resolve a module specifier, trickle(d1) is used to ensure
 // the following import map is added after module loading is triggered but
 // before the first module script is parsed.
-promise_test(() => import('../../resources/empty.js?pipe=trickle(d1)'),
+promise_test(() => import('../resources/empty.js?pipe=trickle(d1)'),
              "A dynamic import succeeds");
 </script>
 <script type="importmap" onload="t.assert_unreached('onload')" onerror="t.done()">
 {
   "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=B"
   }
 }
 </script>
 <script>
 promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
+  return import("../resources/log.js?pipe=sub&name=A")
     .then(() => assert_array_equals(log, ["log:A"]))
   },
   'After a dynamic import(), import maps are not effective');
diff --git a/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html b/import-maps/acquiring/script-tag.html
similarity index 60%
rename from import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
rename to import-maps/acquiring/script-tag.html
index 7f319b04758f8d..2792c2a31d9718 100644
--- a/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
+++ b/import-maps/acquiring/script-tag.html
@@ -3,22 +3,21 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
 const t = async_test(
   'After <script type="module"> import maps should fire error events');
 const log = [];
 </script>
-<script type="module" src="../../resources/empty.js?pipe=trickle(d1)"></script>
+<script type="module" src="../resources/empty.js?pipe=trickle(d1)"></script>
 <script type="importmap" onerror="t.done()">
 {
   "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=B"
   }
 }
 </script>
 <script>
 promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
+  return import("../resources/log.js?pipe=sub&name=A")
     .then(() => assert_array_equals(log, ["log:A"]))
   },
   'After <script type="module"> import maps are not effective');
diff --git a/import-maps/core/module-map-key.tentative.html b/import-maps/acquiring/worker-request.html
similarity index 54%
rename from import-maps/core/module-map-key.tentative.html
rename to import-maps/acquiring/worker-request.html
index 6f2f18a02e12a9..05474ddff2b6d2 100644
--- a/import-maps/core/module-map-key.tentative.html
+++ b/import-maps/acquiring/worker-request.html
@@ -2,6 +2,10 @@
 <html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script>
+const log = [];
+new Worker('../resources/empty.js?pipe=trickle(d1)', {type: "module"});
+</script>
 <script type="importmap">
 {
   "imports": {
@@ -10,16 +14,9 @@
 }
 </script>
 <script>
-const log = [];
-
-// This test reflects the Chromium's current implementation.
-// If the import map resolution is moved into the fetch spec, the module map's
-// key will become the URL/specifier BEFORE import map resolution.
-// https://crbug.com/928435
 promise_test(() => {
   return import("../resources/log.js?pipe=sub&name=A")
-    .then(() => import("../resources/log.js?pipe=sub&name=B"))
     .then(() => assert_array_equals(log, ["log:B"]))
   },
-  "Module map's key is the URL after import map resolution");
+  'After module worker creation import maps are still effective');
 </script>
diff --git a/import-maps/core/bare.sub.tentative.html b/import-maps/bare-specifiers.sub.html
similarity index 75%
rename from import-maps/core/bare.sub.tentative.html
rename to import-maps/bare-specifiers.sub.html
index 7fb769e09a2af4..d087cb31c44705 100644
--- a/import-maps/core/bare.sub.tentative.html
+++ b/import-maps/bare-specifiers.sub.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
+<script src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -10,7 +10,7 @@
 const importMap = `
 {
   "imports": {
-    "bare/bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare/bare": "./resources/log.js?pipe=sub&name=bare",
     "bare/cross-origin-bare": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bare",
     "bare/to-data": "data:text/javascript,log.push('dataURL')",
 
@@ -26,11 +26,6 @@
   // - static import, and
   // - dynamic import.
 
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
   // Bare to HTTP(S).
   "bare/bare":
     [Result.URL, Result.URL, "log:bare", "log:bare"],
diff --git a/import-maps/bare/README.md b/import-maps/bare/README.md
new file mode 100644
index 00000000000000..ce312530ed409d
--- /dev/null
+++ b/import-maps/bare/README.md
@@ -0,0 +1 @@
+This directory contains resources which might get imported, post-mapping. The exact URLs are important, which is why we don't place it under resources/ or similar.
diff --git a/import-maps/core/bare/__dir__.headers b/import-maps/bare/__dir__.headers
similarity index 100%
rename from import-maps/core/bare/__dir__.headers
rename to import-maps/bare/__dir__.headers
diff --git a/import-maps/core/bare/bare b/import-maps/bare/bare
similarity index 100%
rename from import-maps/core/bare/bare
rename to import-maps/bare/bare
diff --git a/import-maps/core/bare/cross-origin-bare b/import-maps/bare/cross-origin-bare
similarity index 100%
rename from import-maps/core/bare/cross-origin-bare
rename to import-maps/bare/cross-origin-bare
diff --git a/import-maps/core/bare/to-bare b/import-maps/bare/to-bare
similarity index 100%
rename from import-maps/core/bare/to-bare
rename to import-maps/bare/to-bare
diff --git a/import-maps/core/bare/to-data b/import-maps/bare/to-data
similarity index 100%
rename from import-maps/core/bare/to-data
rename to import-maps/bare/to-data
diff --git a/import-maps/csp/applied-to-target-dynamic.sub.tentative.html b/import-maps/csp/applied-to-target-dynamic.sub.html
similarity index 100%
rename from import-maps/csp/applied-to-target-dynamic.sub.tentative.html
rename to import-maps/csp/applied-to-target-dynamic.sub.html
diff --git a/import-maps/csp/applied-to-target.sub.tentative.html b/import-maps/csp/applied-to-target.sub.html
similarity index 100%
rename from import-maps/csp/applied-to-target.sub.tentative.html
rename to import-maps/csp/applied-to-target.sub.html
diff --git a/import-maps/csp/hash-failure.tentative.html b/import-maps/csp/hash-failure.html
similarity index 100%
rename from import-maps/csp/hash-failure.tentative.html
rename to import-maps/csp/hash-failure.html
diff --git a/import-maps/csp/hash.tentative.html b/import-maps/csp/hash.html
similarity index 100%
rename from import-maps/csp/hash.tentative.html
rename to import-maps/csp/hash.html
diff --git a/import-maps/csp/nonce-failure.tentative.html b/import-maps/csp/nonce-failure.html
similarity index 100%
rename from import-maps/csp/nonce-failure.tentative.html
rename to import-maps/csp/nonce-failure.html
diff --git a/import-maps/csp/nonce.tentative.html b/import-maps/csp/nonce.html
similarity index 100%
rename from import-maps/csp/nonce.tentative.html
rename to import-maps/csp/nonce.html
diff --git a/import-maps/csp/unsafe-inline.tentative.html b/import-maps/csp/unsafe-inline.html
similarity index 100%
rename from import-maps/csp/unsafe-inline.tentative.html
rename to import-maps/csp/unsafe-inline.html
diff --git a/import-maps/common/README.md b/import-maps/data-driven/README.md
similarity index 98%
rename from import-maps/common/README.md
rename to import-maps/data-driven/README.md
index 6092c0d767050d..60c415f18633e2 100644
--- a/import-maps/common/README.md
+++ b/import-maps/data-driven/README.md
@@ -1,4 +1,4 @@
-# Import maps test JSON format
+# Data-driven import maps tests
 
 In this directory, test inputs and expectations are expressed as JSON files.
 This is in order to share the same JSON files between WPT tests and Jest-based
diff --git a/import-maps/common/parsing.tentative.https.html b/import-maps/data-driven/parsing-internal.https.html
similarity index 97%
rename from import-maps/common/parsing.tentative.https.html
rename to import-maps/data-driven/parsing-internal.https.html
index 0dc9e24c8d84dd..7d45ae8c33bd1f 100644
--- a/import-maps/common/parsing.tentative.https.html
+++ b/import-maps/data-driven/parsing-internal.https.html
@@ -9,7 +9,7 @@
 </script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/import-maps/common/resolving-internal.tentative.https.html b/import-maps/data-driven/resolving-internal.https.html
similarity index 93%
rename from import-maps/common/resolving-internal.tentative.https.html
rename to import-maps/data-driven/resolving-internal.https.html
index a9f7c82fd879ca..887b7474d63ad4 100644
--- a/import-maps/common/resolving-internal.tentative.https.html
+++ b/import-maps/data-driven/resolving-internal.https.html
@@ -7,12 +7,12 @@
 // This test file is for resolution tests that require Chromium's internal
 // methods.
 // For tests that don't use Chromium's internal methods, see
-// resolving.tentative.https.html.
+// resolving.https.html.
 globalThis.useInternalMethods = true;
 </script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/import-maps/common/resolving.tentative.https.html b/import-maps/data-driven/resolving.https.html
similarity index 97%
rename from import-maps/common/resolving.tentative.https.html
rename to import-maps/data-driven/resolving.https.html
index abb30e0afa4f41..40b7ef5dae5010 100644
--- a/import-maps/common/resolving.tentative.https.html
+++ b/import-maps/data-driven/resolving.https.html
@@ -5,7 +5,7 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/import-maps/common/resources/data-base-url.json b/import-maps/data-driven/resources/data-base-url.json
similarity index 100%
rename from import-maps/common/resources/data-base-url.json
rename to import-maps/data-driven/resources/data-base-url.json
diff --git a/import-maps/common/resources/empty-import-map-internal.json b/import-maps/data-driven/resources/empty-import-map-internal.json
similarity index 100%
rename from import-maps/common/resources/empty-import-map-internal.json
rename to import-maps/data-driven/resources/empty-import-map-internal.json
diff --git a/import-maps/common/resources/empty-import-map.json b/import-maps/data-driven/resources/empty-import-map.json
similarity index 100%
rename from import-maps/common/resources/empty-import-map.json
rename to import-maps/data-driven/resources/empty-import-map.json
diff --git a/import-maps/common/resources/overlapping-entries.json b/import-maps/data-driven/resources/overlapping-entries.json
similarity index 100%
rename from import-maps/common/resources/overlapping-entries.json
rename to import-maps/data-driven/resources/overlapping-entries.json
diff --git a/import-maps/common/resources/packages-via-trailing-slashes.json b/import-maps/data-driven/resources/packages-via-trailing-slashes.json
similarity index 100%
rename from import-maps/common/resources/packages-via-trailing-slashes.json
rename to import-maps/data-driven/resources/packages-via-trailing-slashes.json
diff --git a/import-maps/common/resources/parsing-addresses-absolute.json b/import-maps/data-driven/resources/parsing-addresses-absolute.json
similarity index 100%
rename from import-maps/common/resources/parsing-addresses-absolute.json
rename to import-maps/data-driven/resources/parsing-addresses-absolute.json
diff --git a/import-maps/common/resources/parsing-addresses-invalid.json b/import-maps/data-driven/resources/parsing-addresses-invalid.json
similarity index 100%
rename from import-maps/common/resources/parsing-addresses-invalid.json
rename to import-maps/data-driven/resources/parsing-addresses-invalid.json
diff --git a/import-maps/common/resources/parsing-addresses.json b/import-maps/data-driven/resources/parsing-addresses.json
similarity index 100%
rename from import-maps/common/resources/parsing-addresses.json
rename to import-maps/data-driven/resources/parsing-addresses.json
diff --git a/import-maps/common/resources/parsing-invalid-json.json b/import-maps/data-driven/resources/parsing-invalid-json.json
similarity index 100%
rename from import-maps/common/resources/parsing-invalid-json.json
rename to import-maps/data-driven/resources/parsing-invalid-json.json
diff --git a/import-maps/common/resources/parsing-schema-normalization.json b/import-maps/data-driven/resources/parsing-schema-normalization.json
similarity index 100%
rename from import-maps/common/resources/parsing-schema-normalization.json
rename to import-maps/data-driven/resources/parsing-schema-normalization.json
diff --git a/import-maps/common/resources/parsing-schema-scope.json b/import-maps/data-driven/resources/parsing-schema-scope.json
similarity index 100%
rename from import-maps/common/resources/parsing-schema-scope.json
rename to import-maps/data-driven/resources/parsing-schema-scope.json
diff --git a/import-maps/common/resources/parsing-schema-specifier-map.json b/import-maps/data-driven/resources/parsing-schema-specifier-map.json
similarity index 100%
rename from import-maps/common/resources/parsing-schema-specifier-map.json
rename to import-maps/data-driven/resources/parsing-schema-specifier-map.json
diff --git a/import-maps/common/resources/parsing-schema-toplevel.json b/import-maps/data-driven/resources/parsing-schema-toplevel.json
similarity index 100%
rename from import-maps/common/resources/parsing-schema-toplevel.json
rename to import-maps/data-driven/resources/parsing-schema-toplevel.json
diff --git a/import-maps/common/resources/parsing-scope-keys.json b/import-maps/data-driven/resources/parsing-scope-keys.json
similarity index 100%
rename from import-maps/common/resources/parsing-scope-keys.json
rename to import-maps/data-driven/resources/parsing-scope-keys.json
diff --git a/import-maps/common/resources/parsing-specifier-keys.json b/import-maps/data-driven/resources/parsing-specifier-keys.json
similarity index 100%
rename from import-maps/common/resources/parsing-specifier-keys.json
rename to import-maps/data-driven/resources/parsing-specifier-keys.json
diff --git a/import-maps/common/resources/parsing-trailing-slashes.json b/import-maps/data-driven/resources/parsing-trailing-slashes.json
similarity index 100%
rename from import-maps/common/resources/parsing-trailing-slashes.json
rename to import-maps/data-driven/resources/parsing-trailing-slashes.json
diff --git a/import-maps/common/resources/resolving-null.json b/import-maps/data-driven/resources/resolving-null.json
similarity index 100%
rename from import-maps/common/resources/resolving-null.json
rename to import-maps/data-driven/resources/resolving-null.json
diff --git a/import-maps/common/resources/scopes-exact-vs-prefix.json b/import-maps/data-driven/resources/scopes-exact-vs-prefix.json
similarity index 100%
rename from import-maps/common/resources/scopes-exact-vs-prefix.json
rename to import-maps/data-driven/resources/scopes-exact-vs-prefix.json
diff --git a/import-maps/common/resources/scopes.json b/import-maps/data-driven/resources/scopes.json
similarity index 100%
rename from import-maps/common/resources/scopes.json
rename to import-maps/data-driven/resources/scopes.json
diff --git a/import-maps/common/resources/common-test-helper-iframe.js b/import-maps/data-driven/resources/test-helper-iframe.js
similarity index 100%
rename from import-maps/common/resources/common-test-helper-iframe.js
rename to import-maps/data-driven/resources/test-helper-iframe.js
diff --git a/import-maps/common/resources/common-test-helper.js b/import-maps/data-driven/resources/test-helper.js
similarity index 97%
rename from import-maps/common/resources/common-test-helper.js
rename to import-maps/data-driven/resources/test-helper.js
index 2bf99184a0c9c9..0f53aea5b4b050 100644
--- a/import-maps/common/resources/common-test-helper.js
+++ b/import-maps/data-driven/resources/test-helper.js
@@ -7,7 +7,7 @@ const scope = './scope/';
 
 // Global setup: this must be the first promise_test.
 promise_test(async (t) => {
-  const script = 'common-test-service-worker.js';
+  const script = 'service-worker.js';
 
   registration =
       await service_worker_unregister_and_register(t, script, scope);
@@ -38,7 +38,7 @@ function parse(importMap, importMapBaseURL) {
 
     const testHTML = `
       <body>
-      <script src="${location.origin}/import-maps/common/resources/common-test-helper-iframe.js"></script>
+      <script src="${location.origin}/import-maps/data-driven/resources/test-helper-iframe.js"></script>
       <script type="importmap" onerror="onScriptError(event)">
       ${importMapString}
       </script>
diff --git a/import-maps/common/resources/tricky-specifiers.json b/import-maps/data-driven/resources/tricky-specifiers.json
similarity index 100%
rename from import-maps/common/resources/tricky-specifiers.json
rename to import-maps/data-driven/resources/tricky-specifiers.json
diff --git a/import-maps/common/resources/url-specifiers.json b/import-maps/data-driven/resources/url-specifiers.json
similarity index 100%
rename from import-maps/common/resources/url-specifiers.json
rename to import-maps/data-driven/resources/url-specifiers.json
diff --git a/import-maps/common/common-test-service-worker.js b/import-maps/data-driven/service-worker.js
similarity index 91%
rename from import-maps/common/common-test-service-worker.js
rename to import-maps/data-driven/service-worker.js
index 6985c901fa683a..68f293bfbfb497 100644
--- a/import-maps/common/common-test-service-worker.js
+++ b/import-maps/data-driven/service-worker.js
@@ -6,7 +6,7 @@ self.addEventListener('message', event => {
 });
 
 self.addEventListener('fetch', event => {
-    if (event.request.url.indexOf('common-test-helper-iframe.js') >= 0) {
+    if (event.request.url.indexOf('test-helper-iframe.js') >= 0) {
       return;
     }
     if (serveImporterScript) {
diff --git a/import-maps/common/tools/format_json.py b/import-maps/data-driven/tools/format_json.py
similarity index 100%
rename from import-maps/common/tools/format_json.py
rename to import-maps/data-driven/tools/format_json.py
diff --git a/import-maps/core/data.sub.tentative.html b/import-maps/data-url-specifiers.sub.html
similarity index 75%
rename from import-maps/core/data.sub.tentative.html
rename to import-maps/data-url-specifiers.sub.html
index 25c18c45b7dc3e..a6fa12c12662eb 100644
--- a/import-maps/core/data.sub.tentative.html
+++ b/import-maps/data-url-specifiers.sub.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
+<script src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -10,9 +10,9 @@
 const importMap = `
 {
   "imports": {
-    "bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare": "./resources/log.js?pipe=sub&name=bare",
 
-    "data:text/javascript,log.push('data:foo')": "../resources/log.js?pipe=sub&name=foo",
+    "data:text/javascript,log.push('data:foo')": "./resources/log.js?pipe=sub&name=foo",
     "data:text/javascript,log.push('data:cross-origin-foo')": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo",
     "data:text/javascript,log.push('data:to-data')": "data:text/javascript,log.push('dataURL')",
 
@@ -28,11 +28,6 @@
   // - static import, and
   // - dynamic import.
 
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
   // data: to HTTP(S).
   "data:text/javascript,log.push('data:foo')":
     [Result.URL, Result.URL, "log:foo", "log:foo"],
diff --git a/import-maps/core/http.sub.tentative.html b/import-maps/http-url-like-specifiers.sub.html
similarity index 59%
rename from import-maps/core/http.sub.tentative.html
rename to import-maps/http-url-like-specifiers.sub.html
index a33a0945e31671..ba5182354cbcdd 100644
--- a/import-maps/core/http.sub.tentative.html
+++ b/import-maps/http-url-like-specifiers.sub.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
+<script src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -9,13 +9,13 @@
 const importMap = `
 {
   "imports": {
-    "bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare": "./resources/log.js?pipe=sub&name=bare",
 
-    "../resources/log.js?pipe=sub&name=foo": "../resources/log.js?pipe=sub&name=bar",
-    "../resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
-    "../resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
+    "./resources/log.js?pipe=sub&name=foo": "./resources/log.js?pipe=sub&name=bar",
+    "./resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
+    "./resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
 
-    "../resources/log.js?pipe=sub&name=to-bare": "bare"
+    "./resources/log.js?pipe=sub&name=to-bare": "bare"
   }
 }
 `;
@@ -27,11 +27,6 @@
   // - static import, and
   // - dynamic import.
 
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
   // HTTP(S) to HTTP(S).
   "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=foo":
     [Result.URL, Result.URL, "log:bar", "log:bar"],
diff --git a/import-maps/module-map-key.html b/import-maps/module-map-key.html
new file mode 100644
index 00000000000000..3bf15934aa5cb5
--- /dev/null
+++ b/import-maps/module-map-key.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script type="importmap">
+{
+  "imports": {
+    "./resources/log.js?pipe=sub&name=A": "./resources/log.js?pipe=sub&name=B"
+  }
+}
+</script>
+<script>
+const log = [];
+
+promise_test(() => {
+  return import("./resources/log.js?pipe=sub&name=A")
+    .then(() => import("./resources/log.js?pipe=sub&name=B"))
+    .then(() => assert_array_equals(log, ["log:B"]))
+  },
+  "Module map's key is the URL after import map resolution");
+</script>
diff --git a/import-maps/core/not-as-classic-script.html b/import-maps/not-as-classic-script.html
similarity index 100%
rename from import-maps/core/not-as-classic-script.html
rename to import-maps/not-as-classic-script.html
diff --git a/import-maps/resources/test-helper.js b/import-maps/resources/test-helper.js
index 3cb278b7989959..0e870c26f16f12 100644
--- a/import-maps/resources/test-helper.js
+++ b/import-maps/resources/test-helper.js
@@ -10,9 +10,6 @@ function expect_log(test, expected_log) {
 
 // Results of resolving a specifier using import maps.
 const Result = {
-  // A built-in module (std:blank) is loaded.
-  BUILTIN: "builtin",
-
   // A failure considered as a fetch error in a module script tree.
   // <script>'s error event is fired.
   FETCH_ERROR: "fetch_error",
@@ -26,9 +23,9 @@ const Result = {
   // ------------------------- ----------------------
   // ...?name=foo              log:foo
   // data:...log('foo')        foo
-  // Others, e.g. @std/blank   relative:@std/blank
+  // Others, e.g. bare/bare    relative:bare/bare
   // ------------------------- ----------------------
-  // (The last case assumes a file `@std/blank` that logs `relative:@std/blank`
+  // (The last case assumes a file `bare/bare` that logs `relative:bare/bare`
   // exists)
   URL: "URL",
 };
@@ -79,9 +76,7 @@ function getHandlers(t, specifier, expected) {
     });
   } else {
     let expected_log;
-    if (expected === Result.BUILTIN) {
-      expected_log = [];
-    } else if (expected === Result.URL) {
+    if (expected === Result.URL) {
       const match_data_url = specifier.match(/data:.*log\.push\('(.*)'\)/);
       const match_log_js = specifier.match(/name=(.*)/);
       if (match_data_url) {
diff --git a/import-maps/core/static-import.py b/import-maps/static-import.py
similarity index 54%
rename from import-maps/core/static-import.py
rename to import-maps/static-import.py
index 68583be13c42d8..fcf823c113ee22 100644
--- a/import-maps/core/static-import.py
+++ b/import-maps/static-import.py
@@ -1,3 +1,7 @@
+# This file needs to be a sibling of the test files (and not under resources/)
+# so that base URL resolution is the same between those test files and <script>s
+# pointing to this file.
+
 from wptserve.utils import isomorphic_decode
 
 def main(request, response):
diff --git a/lint.ignore b/lint.ignore
index 2d0508fd9ba180..07c6fb7b85cbe5 100644
--- a/lint.ignore
+++ b/lint.ignore
@@ -692,7 +692,7 @@ MISSING-LINK: css/geometry/*.any.js
 MISSING-LINK: css/filter-effects/*.any.js
 
 # Tests that use WebKit/Blink testing APIs
-LAYOUTTESTS APIS: import-maps/common/resources/common-test-helper-iframe.js
+LAYOUTTESTS APIS: import-maps/data-driven/resources/test-helper-iframe.js
 LAYOUTTESTS APIS: resources/chromium/enable-hyperlink-auditing.js
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
 LAYOUTTESTS APIS: resources/chromium/webxr-test.js
