diff --git a/credential-management/fedcm-revoke.sub.https.html b/credential-management/fedcm-revoke.https.html
similarity index 51%
rename from credential-management/fedcm-revoke.sub.https.html
rename to credential-management/fedcm-revoke.https.html
index 79a9a872f46cdd..f0c3e5eb2d20e8 100644
--- a/credential-management/fedcm-revoke.sub.https.html
+++ b/credential-management/fedcm-revoke.https.html
@@ -2,17 +2,16 @@
 <meta charset="utf-8">
 <title>FederatedCredential.revoke() promise resolution</title>
 <link rel="author" title="Christian Biesinger" href="mailto:cbiesinger@chromium.org">
-<link rel="help" href="https://fedidcg.github.io/FedCM/#browser-api-revocation">
+<link rel="help" href="https://wicg.github.io/FedCM/#browser-api-revocation">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <script type="module">
-  import {set_fedcm_cookie} from './support/fedcm-helper.js';
-  const url_prefix = 'https://{{host}}:{{ports[https][0]}}/credential-management/support/';
+  import {fedcm_test} from './support/fedcm-helper.js';
 
   async function getCredential(provider_url) {
     const provider = {
-      url: provider_url || url_prefix,
+      url: provider_url || "https://idp.example/",
       clientId: "1234",
     };
     return await navigator.credentials.get({
@@ -22,34 +21,24 @@
     });
   }
 
-  promise_test(async t => {
-    await set_fedcm_cookie();
-    await (await getCredential()).login({nonce: '1'});
-    await (await getCredential()).revoke("1234");
-
-    // Second revoke should now fail since the first revoke should revoke
-    // the permission.
-    const result = (await getCredential()).revoke("1234");
-    return promise_rejects_dom(t, "NetworkError", result);
+  fedcm_test(async (t, mock) => {
+    mock.revokeReturn("kSuccess");
+    await (await getCredential()).revoke("foo@bar.com");
   }, "Successfully revoking a token should resolve the promise.");
 
-  promise_test(async t => {
-    // Have to first login or the request will be rejected before it reaches
-    // the server.
-    await set_fedcm_cookie();
-    await (await getCredential()).login({nonce: '1'});
-    await (await getCredential()).revoke("1234");
-
-    const result = (await getCredential()).revoke("fail");
+  fedcm_test(async (t, mock) => {
+    mock.revokeReturn("kError");
+    const result = (await getCredential()).revoke("foo@bar.com");
     return promise_rejects_dom(t, "NetworkError", result);
   }, "Error should reject the promise.");
 
-  promise_test(async t => {
+  fedcm_test(async (t, mock) => {
+    mock.revokeReturn("kError");
     const result = (await getCredential()).revoke("");
     return promise_rejects_dom(t, "InvalidStateError", result);
   }, "Empty hint should reject the promise.");
 
-  promise_test(async t => {
+  fedcm_test(async (t, mock) => {
     const result = getCredential("https://other-idp.example/").then((c) => c.revoke("foo@bar.com"));
     return promise_rejects_dom(t, "NetworkError", result);
   }, "Provider URL should honor Content-Security-Policy.");
diff --git a/credential-management/fedcm-revoke.https.html.headers b/credential-management/fedcm-revoke.https.html.headers
new file mode 100644
index 00000000000000..fd82d505dd48e2
--- /dev/null
+++ b/credential-management/fedcm-revoke.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src https://idp.example
diff --git a/credential-management/fedcm-revoke.sub.https.html.sub.headers b/credential-management/fedcm-revoke.sub.https.html.sub.headers
deleted file mode 100644
index 69b5bf33f46736..00000000000000
--- a/credential-management/fedcm-revoke.sub.https.html.sub.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src https://{{host}}:{{ports[https][0]}}
diff --git a/credential-management/support/revoke.py b/credential-management/support/revoke.py
deleted file mode 100644
index ed6fe00dfd7c37..00000000000000
--- a/credential-management/support/revoke.py
+++ /dev/null
@@ -1,6 +0,0 @@
-def main(request, response):
-  if not b"hint" in request.POST:
-    return (500, [], "Missing hint")
-  if request.POST[b"hint"] == b"fail":
-    return (500, [], "Fail requested")
-  return (204, [], "")