diff --git a/testing/web-platform/tests/credential-management/fedcm-abort.https.html b/testing/web-platform/tests/credential-management/fedcm-abort.https.html
new file mode 100644
index 0000000000000..0f03bff832f80
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-abort.https.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let controller = new AbortController();
+  let test_options = request_options_with_mediation_required();
+  test_options.signal = controller.signal;
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  controller.abort();
+  return promise_rejects_dom(t, 'AbortError', cred);
+}, "Test the abort signal");
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-after-abort.https.html b/testing/web-platform/tests/credential-management/fedcm-after-abort.https.html
new file mode 100644
index 0000000000000..3c2f981e82fab
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-after-abort.https.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let controller = new AbortController();
+  let test_options = request_options_with_mediation_required();
+  test_options.signal = controller.signal;
+  const first_cred = fedcm_get_and_select_first_account(t, test_options);
+  controller.abort();
+  await promise_rejects_dom(t, 'AbortError', first_cred);
+
+  const second_cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
+  assert_equals(second_cred.token, "token");
+}, "Get after abort should work");
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-basic.https.html b/testing/web-platform/tests/credential-management/fedcm-basic.https.html
new file mode 100644
index 0000000000000..1c2b916103c51
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-basic.https.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+
+<script type="module">
+import {fedcm_test,
+        request_options_with_mediation_required,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
+  assert_equals(cred.token, "token");
+}, "Successfully obtaining token should resolve the promise.");
+
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-client-metadata-not-cached.https.html b/testing/web-platform/tests/credential-management/fedcm-client-metadata-not-cached.https.html
new file mode 100644
index 0000000000000..b802369256ab4
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-client-metadata-not-cached.https.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  // Reset the client_metadata fetch count.
+  const clear_metadata_count_path = `support/fedcm/client_metadata_clear_count.py`;
+  await fetch(clear_metadata_count_path);
+
+  // FedCM flow causes the counter of client metadata to increase by 1.
+  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
+  assert_equals(cred.token, "token");
+
+  await new Promise(resolve => {
+    // Fetch the client metadata from a popup window.
+    let popup_window = window.open('support/fedcm/client_metadata.py?skip_checks=1');
+    const popup_window_load_handler = (event) => {
+      popup_window.removeEventListener('load', popup_window_load_handler);
+      popup_window.close();
+      resolve();
+    };
+    popup_window.addEventListener('load', popup_window_load_handler);
+  });
+
+  const client_metadata_counter = await fetch(clear_metadata_count_path);
+  const client_metadata_counter_text = await client_metadata_counter.text();
+  // Check that the client metadata response is not cached. If the client metadata response was
+  // cached, when the user visits the IDP as a first party, the IDP would be able to determine the
+  // last RP the user visited regardless of whether the user granted consent via the FedCM prompt.
+  assert_equals(client_metadata_counter_text, "2");
+}, 'Test client_metadata request is not cached');
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-endpoint-redirects.https.html b/testing/web-platform/tests/credential-management/fedcm-endpoint-redirects.https.html
new file mode 100644
index 0000000000000..4aebc17f1ba6e
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-endpoint-redirects.https.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        select_manifest,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required("manifest_redirect_accounts.json");
+  await select_manifest(t, test_options);
+
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_dom(t, 'NetworkError', cred);
+}, 'Test that promise is rejected if accounts endpoint redirects');
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required("manifest_redirect_token.json");
+  await select_manifest(t, test_options);
+
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_dom(t, 'NetworkError', cred);
+}, 'Test that token endpoint does not follow redirects');
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-manifest-not-in-list.https.html b/testing/web-platform/tests/credential-management/fedcm-manifest-not-in-list.https.html
new file mode 100644
index 0000000000000..8d85d9eb36783
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-manifest-not-in-list.https.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required('manifest-not-in-list.json');
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_dom(t, 'NetworkError', cred);
+}, 'Test that the promise is rejected if the manifest is not in the manifest list');
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-network-requests.https.html b/testing/web-platform/tests/credential-management/fedcm-network-requests.https.html
deleted file mode 100644
index def6d59b7c26b..0000000000000
--- a/testing/web-platform/tests/credential-management/fedcm-network-requests.https.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<title>Federated Credential Management API network request tests.</title>
-<link rel="help" href="https://fedidcg.github.io/FedCM">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
-
-<body>
-
-<script type="module">
-import {request_options_with_mediation_required,
-        alt_request_options_with_mediation_required,
-        request_options_with_mediation_optional,
-        fedcm_test,
-        select_manifest,
-        set_fedcm_cookie,
-        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
-
-function loadUrlInIframe(url) {
-  let iframe = document.createElement("iframe");
-  return new Promise(resolve => {
-    iframe.src = url;
-    iframe.onload = function() { resolve(iframe); };
-    document.body.appendChild(iframe);
-  });
-}
-
-fedcm_test(async t => {
-  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
-  assert_equals(cred.token, "token");
-}, "Successfully obtaining token should resolve the promise.");
-
-fedcm_test(async t => {
-  const first = fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
-  const second = fedcm_get_and_select_first_account(t, alt_request_options_with_mediation_required());
-
-  // We have to call promise_rejects_dom here, because if we call it after
-  // the promise gets rejected, the unhandled rejection event handler is called
-  // and fails the test even if we handle the rejection later.
-  const rej = promise_rejects_dom(t, 'AbortError', second);
-
-  const first_cred = await first;
-  assert_equals(first_cred.token, "token");
-
-  return rej;
-},
-"When there's a pending request, a second `get` call should be rejected. ");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  test_options.identity.providers = [];
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_js(t, TypeError, cred);
-}, "Reject when provider list is empty");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  delete test_options.identity.providers[0].configURL;
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_js(t, TypeError, cred);
-}, "Reject when configURL is missing" );
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  test_options.identity.providers[0].configURL = 'test';
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_dom(t, "InvalidStateError", cred);
-}, "Reject when configURL is invalid");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  test_options.identity.providers[0].clientId = '';
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_dom(t, "InvalidStateError", cred);
-}, "Reject when clientId is empty");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  assert_true("nonce" in test_options.identity.providers[0]);
-  delete test_options.identity.providers[0].nonce;
-  const cred = await fedcm_get_and_select_first_account(t, test_options);
-  assert_equals(cred.token, "token");
-}, "nonce is not required in FederatedIdentityProvider.");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required();
-  delete test_options.identity.providers[0].clientId;
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_js(t, TypeError, cred);
-}, "Reject when clientId is missing" );
-
-fedcm_test(async t => {
-  let controller = new AbortController();
-  let test_options = request_options_with_mediation_required();
-  test_options.signal = controller.signal;
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  controller.abort();
-  return promise_rejects_dom(t, 'AbortError', cred);
-}, "Test the abort signal");
-
-fedcm_test(async t => {
-  let controller = new AbortController();
-  let test_options = request_options_with_mediation_required();
-  test_options.signal = controller.signal;
-  const first_cred = fedcm_get_and_select_first_account(t, test_options);
-  controller.abort();
-  await promise_rejects_dom(t, 'AbortError', first_cred);
-
-  const second_cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
-  assert_equals(second_cred.token, "token");
-}, "Get after abort should work");
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required('manifest-not-in-list.json');
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_dom(t, 'NetworkError', cred);
-}, 'Test that the promise is rejected if the manifest is not in the manifest list');
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required("manifest_redirect_accounts.json");
-  await select_manifest(t, test_options);
-
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_dom(t, 'NetworkError', cred);
-}, 'Test that promise is rejected if accounts endpoint redirects');
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_required("manifest_redirect_token.json");
-  await select_manifest(t, test_options);
-
-  const cred = fedcm_get_and_select_first_account(t, test_options);
-  return promise_rejects_dom(t, 'NetworkError', cred);
-}, 'Test that token endpoint does not follow redirects');
-
-fedcm_test(async t => {
-  // Reset the client_metadata fetch count.
-  const clear_metadata_count_path = `support/fedcm/client_metadata_clear_count.py`;
-  await fetch(clear_metadata_count_path);
-
-  // FedCM flow causes the counter of client metadata to increase by 1.
-  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
-  assert_equals(cred.token, "token");
-
-  await new Promise(resolve => {
-    // Fetch the client metadata from a popup window.
-    let popup_window = window.open('support/fedcm/client_metadata.py?skip_checks=1');
-    const popup_window_load_handler = (event) => {
-      popup_window.removeEventListener('load', popup_window_load_handler);
-      popup_window.close();
-      resolve();
-    };
-    popup_window.addEventListener('load', popup_window_load_handler);
-  });
-
-  const client_metadata_counter = await fetch(clear_metadata_count_path);
-  const client_metadata_counter_text = await client_metadata_counter.text();
-  // Check that the client metadata response is not cached. If the client metadata response was
-  // cached, when the user visits the IDP as a first party, the IDP would be able to determine the
-  // last RP the user visited regardless of whether the user granted consent via the FedCM prompt.
-  assert_equals(client_metadata_counter_text, "2");
-}, 'Test client_metadata request is not cached');
-
-fedcm_test(async t => {
-  const service_worker_url = 'support/fedcm/intercept_service_worker.js';
-  const sw_scope_url = '/credential-management/support/fedcm/';
-  // URL for querying number of page loads observed by service worker.
-  const query_sw_intercepts_url = 'support/fedcm/query_service_worker_intercepts.html';
-  const page_in_sw_scope_url = 'support/fedcm/simple.html';
-
-  const sw_registration = await service_worker_unregister_and_register(
-      t, service_worker_url, sw_scope_url);
-  t.add_cleanup(() => service_worker_unregister(t, sw_scope_url));
-  await wait_for_state(t, sw_registration.installing, 'activated');
-
-  // Verify that service worker works.
-  await loadUrlInIframe(page_in_sw_scope_url);
-  let query_sw_iframe = await loadUrlInIframe(query_sw_intercepts_url);
-  assert_equals(query_sw_iframe.contentDocument.body.textContent, "1");
-
-  await set_fedcm_cookie();
-  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
-  assert_equals(cred.token, "token");
-
-  // Use cache buster query parameter to avoid cached response.
-  let query_sw_iframe2 = await loadUrlInIframe(query_sw_intercepts_url + "?2");
-  assert_equals(query_sw_iframe2.contentDocument.body.textContent, "1");
-}, 'Test that service worker cannot observe fetches performed by FedCM API');
-
-fedcm_test(async t => {
-  let test_options = request_options_with_mediation_optional("manifest_with_single_account.json");
-  await select_manifest(t, test_options);
-
-  // Signs in john_doe so that they will be a returning user
-  let cred = await fedcm_get_and_select_first_account(t, test_options);
-  assert_equals(cred.token, "account_id=john_doe");
-
-  test_options = request_options_with_mediation_optional("manifest_with_two_accounts.json");
-  await select_manifest(t, test_options);
-
-  // There are two accounts "Jane" and "John" returned in that order. Without
-  // auto re-authn, the first account "Jane" would be selected and an token
-  // would be issued to that account. However, since "John" is returning and
-  // "Jane" is a new user, the second account "John" will be selected.
-  cred = await fedcm_get_and_select_first_account(t, test_options);
-  assert_equals(cred.token, "account_id=john_doe");
-}, "Test that the returning account from the two accounts will be auto re-authenticated.");
-
-</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-nonce-is-optional.https.html b/testing/web-platform/tests/credential-management/fedcm-nonce-is-optional.https.html
new file mode 100644
index 0000000000000..dafd6c9e98305
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-nonce-is-optional.https.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  assert_true("nonce" in test_options.identity.providers[0]);
+  delete test_options.identity.providers[0].nonce;
+  const cred = await fedcm_get_and_select_first_account(t, test_options);
+  assert_equals(cred.token, "token");
+}, "nonce is not required in FederatedIdentityProvider.");
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-not-observer-by-service-worker.https.html b/testing/web-platform/tests/credential-management/fedcm-not-observer-by-service-worker.https.html
new file mode 100644
index 0000000000000..072d66966566c
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-not-observer-by-service-worker.https.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+
+<body>
+
+<script type="module">
+import {fedcm_test,
+        request_options_with_mediation_required,
+        set_fedcm_cookie,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+function loadUrlInIframe(url) {
+  let iframe = document.createElement("iframe");
+  return new Promise(resolve => {
+    iframe.src = url;
+    iframe.onload = function() { resolve(iframe); };
+    document.body.appendChild(iframe);
+  });
+}
+
+fedcm_test(async t => {
+  const service_worker_url = 'support/fedcm/intercept_service_worker.js';
+  const sw_scope_url = '/credential-management/support/fedcm/';
+  // URL for querying number of page loads observed by service worker.
+  const query_sw_intercepts_url = 'support/fedcm/query_service_worker_intercepts.html';
+  const page_in_sw_scope_url = 'support/fedcm/simple.html';
+
+  const sw_registration = await service_worker_unregister_and_register(
+      t, service_worker_url, sw_scope_url);
+  t.add_cleanup(() => service_worker_unregister(t, sw_scope_url));
+  await wait_for_state(t, sw_registration.installing, 'activated');
+
+  // Verify that service worker works.
+  await loadUrlInIframe(page_in_sw_scope_url);
+  let query_sw_iframe = await loadUrlInIframe(query_sw_intercepts_url);
+  assert_equals(query_sw_iframe.contentDocument.body.textContent, "1");
+
+  await set_fedcm_cookie();
+  const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
+  assert_equals(cred.token, "token");
+
+  // Use cache buster query parameter to avoid cached response.
+  let query_sw_iframe2 = await loadUrlInIframe(query_sw_intercepts_url + "?2");
+  assert_equals(query_sw_iframe2.contentDocument.body.textContent, "1");
+}, 'Test that service worker cannot observe fetches performed by FedCM API');
+
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-pending-call-rejected.https.html b/testing/web-platform/tests/credential-management/fedcm-pending-call-rejected.https.html
new file mode 100644
index 0000000000000..feb3f903d87a3
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-pending-call-rejected.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_required,
+        alt_request_options_with_mediation_required,
+        fedcm_test,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  const first = fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
+  const second = navigator.credentials.get(alt_request_options_with_mediation_required());
+
+  // We have to call promise_rejects_dom here, because if we call it after
+  // the promise gets rejected, the unhandled rejection event handler is called
+  // and fails the test even if we handle the rejection later.
+  const rej = promise_rejects_dom(t, 'AbortError', second);
+
+  const first_cred = await first;
+  assert_equals(first_cred.token, "token");
+
+  return rej;
+}, "When there's a pending request, a second `get` call should be rejected.");
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-reject-invalid-responses.https.html b/testing/web-platform/tests/credential-management/fedcm-reject-invalid-responses.https.html
new file mode 100644
index 0000000000000..f450d568249ec
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-reject-invalid-responses.https.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {fedcm_test,
+        request_options_with_mediation_required,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  test_options.identity.providers = [];
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_js(t, TypeError, cred);
+}, "Reject when provider list is empty");
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  delete test_options.identity.providers[0].configURL;
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_js(t, TypeError, cred);
+}, "Reject when configURL is missing" );
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  test_options.identity.providers[0].configURL = 'test';
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_dom(t, "InvalidStateError", cred);
+}, "Reject when configURL is invalid");
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  test_options.identity.providers[0].clientId = '';
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_dom(t, "InvalidStateError", cred);
+}, "Reject when clientId is empty");
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_required();
+  delete test_options.identity.providers[0].clientId;
+  const cred = fedcm_get_and_select_first_account(t, test_options);
+  return promise_rejects_js(t, TypeError, cred);
+}, "Reject when clientId is missing" );
+</script>
diff --git a/testing/web-platform/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html b/testing/web-platform/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
new file mode 100644
index 0000000000000..e5b3996112424
--- /dev/null
+++ b/testing/web-platform/tests/credential-management/fedcm-returning-account-auto-reauthn.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<title>Federated Credential Management API network request tests.</title>
+<link rel="help" href="https://fedidcg.github.io/FedCM">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<script type="module">
+import {request_options_with_mediation_optional,
+        fedcm_test,
+        select_manifest,
+        fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
+
+fedcm_test(async t => {
+  let test_options = request_options_with_mediation_optional("manifest_with_single_account.json");
+  await select_manifest(t, test_options);
+
+  // Signs in john_doe so that they will be a returning user
+  let cred = await fedcm_get_and_select_first_account(t, test_options);
+  assert_equals(cred.token, "account_id=john_doe");
+
+  test_options = request_options_with_mediation_optional("manifest_with_two_accounts.json");
+  await select_manifest(t, test_options);
+
+  // There are two accounts "Jane" and "John" returned in that order. Without
+  // auto re-authn, the first account "Jane" would be selected and an token
+  // would be issued to that account. However, since "John" is returning and
+  // "Jane" is a new user, the second account "John" will be selected.
+  cred = await navigator.credentials.get(test_options);
+  assert_equals(cred.token, "account_id=john_doe");
+}, "Test that the returning account from the two accounts will be auto re-authenticated.");
+</script>
