diff --git a/testing/web-platform/tests/geolocation/PositionOptions.https.html b/testing/web-platform/tests/geolocation/PositionOptions.https.html
index 6b36d66d7358c..e54e8679aa9d1 100644
--- a/testing/web-platform/tests/geolocation/PositionOptions.https.html
+++ b/testing/web-platform/tests/geolocation/PositionOptions.https.html
@@ -11,14 +11,13 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <script>
-  const resetPermission = () => {
-    return test_driver.set_permission({ name: "geolocation" }, "prompt");
-  };
+  promise_setup(async ()=>{
+    await test_driver.set_permission({ name: "geolocation" }, "granted");
+  });
+
   const invalidValues = ["boom", 321, -Infinity, { foo: 5 }];
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     for (const enableHighAccuracy of invalidValues) {
       navigator.geolocation.getCurrentPosition(() => {}, null, {
         enableHighAccuracy,
@@ -27,8 +26,6 @@
   }, "Call getCurrentPosition with wrong type for enableHighAccuracy. No exception expected.");
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     for (const enableHighAccuracy of invalidValues) {
       const id = navigator.geolocation.watchPosition(() => {}, null, {
         enableHighAccuracy,
@@ -38,8 +35,6 @@
   }, "Call watchPosition with wrong type for enableHighAccuracy. No exception expected.");
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     const error = await new Promise((resolve, reject) => {
       navigator.geolocation.getCurrentPosition(reject, resolve, {
         timeout: 0,
@@ -50,8 +45,6 @@
   }, "Set timeout and maximumAge to 0, check that timeout error raised (getCurrentPosition)");
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     let watchId;
     const error = await new Promise((resolve, reject) => {
       watchId = navigator.geolocation.watchPosition(reject, resolve, {
@@ -64,8 +57,6 @@
   }, "Set timeout and maximumAge to 0, check that timeout error raised (watchPosition)");
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     let watchId;
     const error = await new Promise((resolve, reject) => {
       watchId = navigator.geolocation.getCurrentPosition(reject, resolve, {
@@ -78,8 +69,6 @@
   }, "Check that a negative timeout and maxAge values are clamped to 0 (getCurrentPosition)");
 
   promise_test(async (t) => {
-    t.add_cleanup(resetPermission);
-    await test_driver.set_permission({ name: "geolocation" }, "granted");
     let watchId;
     const error = await new Promise((resolve, reject) => {
       watchId = navigator.geolocation.watchPosition(reject, resolve, {
diff --git a/testing/web-platform/tests/geolocation/non-fully-active.https.html b/testing/web-platform/tests/geolocation/non-fully-active.https.html
index 7b381be7fff68..20fcdae12a044 100644
--- a/testing/web-platform/tests/geolocation/non-fully-active.https.html
+++ b/testing/web-platform/tests/geolocation/non-fully-active.https.html
@@ -9,15 +9,13 @@
 <script src="support.js"></script>
 <body></body>
 <script>
-  promise_test(async (t) => {
-    t.add_cleanup(() => {
-      return test_driver.set_permission({ name: "geolocation" }, "prompt");
-    });
+  promise_setup(async () => {
     await test_driver.set_permission({ name: "geolocation" }, "granted");
+  });
 
+  promise_test(async (t) => {
     // Create the iframe, wait for it to load...
     const iframe = document.createElement("iframe");
-    // ...wait for the iframe to load...
     await new Promise((resolve) => {
       iframe.src = "resources/iframe.html";
       iframe.allow = "geolocation";
diff --git a/testing/web-platform/tests/geolocation/permission.https.html b/testing/web-platform/tests/geolocation/permission.https.html
index 4062843349d77..aa46caf32c347 100644
--- a/testing/web-platform/tests/geolocation/permission.https.html
+++ b/testing/web-platform/tests/geolocation/permission.https.html
@@ -1,14 +1,22 @@
-<!doctype html>
-<meta charset=utf-8>
+<!DOCTYPE html>
+<meta charset="utf-8" />
 <title>Test geolocation is a powerful feature via Permissions API</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 
 <script>
-promise_test(async (test) => {
-  const status = await navigator.permissions.query({ name: "geolocation" });
-  assert_true(status instanceof PermissionStatus);
-  assert_equals(status.name, "geolocation", `permission's name must be "geolocation"`);
-  assert_equals(status.state, "prompt", `permission's state must be "prompt" by default`);
-}, `Query "geolocation" powerful feature`);
+  promise_test(async (test) => {
+    const status = await navigator.permissions.query({ name: "geolocation" });
+    assert_true(status instanceof PermissionStatus);
+    assert_equals(
+      status.name,
+      "geolocation",
+      `permission's name must be "geolocation"`
+    );
+    const states = ["prompt", "granted", "denied"];
+    assert_true(
+      states.includes(status.state),
+      `permission's state must be one of ${states.join(", ")}`
+    );
+  }, `Query "geolocation" powerful feature`);
 </script>
