diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 5eedcc1e4bcc..167547e3453f 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -14857,12 +14857,6 @@
      {}
     ]
    ],
-   "payment-request/payment-request-abort-method-manual.https.html": [
-    [
-     "/payment-request/payment-request-abort-method-manual.https.html",
-     {}
-    ]
-   ],
    "payment-request/payment-request-canmakepayment-method-manual.https.html": [
     [
      "/payment-request/payment-request-canmakepayment-method-manual.https.html",
@@ -354461,6 +354455,14 @@
      {}
     ]
    ],
+   "payment-request/payment-request-abort-method.https.html": [
+    [
+     "/payment-request/payment-request-abort-method.https.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "payment-request/payment-request-constructor-crash.https.html": [
     [
      "/payment-request/payment-request-constructor-crash.https.html",
@@ -588874,9 +588876,9 @@
    "2280f0ef821cdc3093e10c2162d3756f5eeb78de",
    "testharness"
   ],
-  "payment-request/payment-request-abort-method-manual.https.html": [
-   "6ed75457d922671e7b2ffbf1c0d22f69bbb681e4",
-   "manual"
+  "payment-request/payment-request-abort-method.https.html": [
+   "a9d811dc41487ba7a8e5d55319574364b93362aa",
+   "testharness"
   ],
   "payment-request/payment-request-canmakepayment-method-manual.https.html": [
    "40e5bf0445eedb6bb78bd61fa4a468652462a14d",
diff --git a/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html b/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html
deleted file mode 100644
index 9552c3ce3fde..000000000000
--- a/testing/web-platform/tests/payment-request/payment-request-abort-method-manual.https.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Test for PaymentRequest.abort() method</title>
-<link rel="help" href="https://w3c.github.io/browser-payment-api/#abort-method">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-"use strict";
-setup({
-  // Ignore unhandled rejections resulting from .show()'s acceptPromise
-  // not being explicitly handled.
-  allow_uncaught_exception: true,
-  explicit_done: true,
-  explicit_timeout: true,
-});
-const basicCard = Object.freeze({ supportedMethods: "basic-card" });
-const defaultMethods = Object.freeze([basicCard]);
-const defaultDetails = Object.freeze({
-  total: {
-    label: "Total",
-    amount: {
-      currency: "USD",
-      value: "1.00",
-    },
-  },
-});
-
-promise_test(async t => {
-  // request is in "created" state
-  const request = new PaymentRequest(defaultMethods, defaultDetails);
-  await promise_rejects(t, "InvalidStateError", request.abort());
-}, `Throws if the promise [[state]] is not "interactive"`);
-
-function manualTest1(elem){
-  elem.disabled = true;
-  promise_test(async t => {
-    // request is in "created" state.
-    const request = new PaymentRequest(defaultMethods, defaultDetails);
-    await promise_rejects(t, "InvalidStateError", request.abort());
-    // Call it again, for good measure.
-    await promise_rejects(t, "InvalidStateError", request.abort());
-    // The request's state is "created", so let's show it
-    // which changes the state to "interactive.".
-    const acceptPromise = request.show();
-    // Let's set request the state to "closed" by calling .abort()
-    try {
-      await request.abort();
-    } catch (err) {
-      assert_unreached("Unexpected promise rejection: " + err.message);
-    }
-    // The request is now "closed", so...
-    await promise_rejects(t, "InvalidStateError", request.abort());
-    await promise_rejects(t, "AbortError", acceptPromise);
-  }, elem.textContent.trim());
-}
-
-function manualTest2(elem){
-  elem.disabled = true;
-  promise_test(async t => {
-    const request = new PaymentRequest(defaultMethods, defaultDetails);
-    const acceptPromise = request.show();
-    try {
-      await request.abort();
-    } catch (err) {
-      assert_unreached("Unexpected promise rejection: " + err.message);
-    }
-    await promise_rejects(t, "AbortError", acceptPromise);
-    // As request is now "closed", trying to show it will fail
-    await promise_rejects(t, "InvalidStateError", request.show());
-  }, elem.textContent.trim());
-  done();
-}
-</script>
-
-<h2>Test for PaymentRequest.abort() method</h2>
-<p>
-  Click on each button in sequence from top to bottom without refreshing the page.
-  No payment sheet will be shown, but the tests will run in the background.
-</p>
-<ol>
-  <li>
-    <button onclick="manualTest1(this)">
-      Calling abort must not change the [[state]] until after "interactive".
-    </button>
-  </li>
-  <li>
-    <button onclick="manualTest2(this)">
-      Calling .abort() causes acceptPromise to reject and closes the request.
-    </button>
-  </li>
-</ol>
-<small>
-  If you find a buggy test, please <a href="https://github.com/w3c/web-platform-tests/issues">file a bug</a>
-  and tag one of the <a href="https://github.com/w3c/web-platform-tests/blob/master/payment-request/OWNERS">owners</a>.
-</small>
diff --git a/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html b/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html
new file mode 100644
index 000000000000..d1f693a6ceff
--- /dev/null
+++ b/testing/web-platform/tests/payment-request/payment-request-abort-method.https.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test for PaymentRequest.abort() method</title>
+<link rel="help" href="https://w3c.github.io/browser-payment-api/#abort-method">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src='/resources/testdriver-vendor.js'></script>
+<script src="/resources/testdriver.js"></script>
+<script>
+"use strict";
+setup({
+  // Ignore unhandled rejections resulting from .show()'s acceptPromise
+  // not being explicitly handled.
+  allow_uncaught_exception: true,
+  explicit_timeout: true,
+});
+const basicCard = Object.freeze({ supportedMethods: "basic-card" });
+const defaultMethods = Object.freeze([basicCard]);
+const defaultDetails = Object.freeze({
+  total: {
+    label: "Total",
+    amount: {
+      currency: "USD",
+      value: "1.00",
+    },
+  },
+});
+
+window.onload = async () => {
+  promise_test(async t => {
+    // request is in "created" state
+    const request = new PaymentRequest(defaultMethods, defaultDetails);
+    await promise_rejects(t, "InvalidStateError", request.abort());
+  }, `Throws if the promise [[state]] is not "interactive"`);
+
+  const button = document.getElementById("button");
+
+  promise_test(async t => {
+    button.onclick = async () => {
+      const request = new PaymentRequest(defaultMethods, defaultDetails);
+      const acceptPromise = request.show();
+      try {
+        await request.abort();
+      } catch (err) {
+        assert_unreached("Unexpected promise rejection: " + err.message);
+      }
+      await promise_rejects(t, "AbortError", acceptPromise);
+      // As request is now "closed", trying to show it will fail
+      await promise_rejects(t, "InvalidStateError", request.show());
+    };
+    await test_driver.click(button);
+  });
+
+  promise_test(async t => {
+    button.onclick = async () => {
+      // request is in "created" state.
+      const request = new PaymentRequest(defaultMethods, defaultDetails);
+      await promise_rejects(t, "InvalidStateError", request.abort());
+      // Call it again, for good measure.
+      await promise_rejects(t, "InvalidStateError", request.abort());
+      // The request's state is "created", so let's show it
+      // which changes the state to "interactive.".
+      const acceptPromise = request.show();
+      // Let's set request the state to "closed" by calling .abort()
+      try {
+        await request.abort();
+      } catch (err) {
+        assert_unreached("Unexpected promise rejection: " + err.message);
+      }
+      // The request is now "closed", so...
+      await promise_rejects(t, "InvalidStateError", request.abort());
+      await promise_rejects(t, "AbortError", acceptPromise);
+    };
+    await test_driver.click(button);
+  });
+};
+</script>
+<button id="button"></button>
