4 files changed, 22 insertions, 14 deletions
diff --git a/tools/wpt/certs/README.md b/tools/wpt/certs/README.md
index f898fb99e..c2d74ee3d 100644
--- a/tools/wpt/certs/README.md
+++ b/tools/wpt/certs/README.md
@@ -18,13 +18,13 @@ index 87a8cc9cc7..bbf500d8ca 100644
         "duration": duration,
 ```
 
-2. `cd test_util/wpt/`
+2. `cd tests/wpt/suite/`
 3. `./wpt serve --config tools/certs/config.json`
 4. Run:
 
 ```
-cp test_util/wpt/tools/certs/cacert.key tools/wpt/certs/cacert.key
-cp test_util/wpt/tools/certs/cacert.pem tools/wpt/certs/cacert.pem
-cp test_util/wpt/tools/certs/web-platform.test.key tools/wpt/certs/web-platform.test.key
-cp test_util/wpt/tools/certs/web-platform.test.pem tools/wpt/certs/web-platform.test.pem
+cp tests/wpt/suite/tools/certs/cacert.key tools/wpt/certs/cacert.key
+cp tests/wpt/suite/tools/certs/cacert.pem tools/wpt/certs/cacert.pem
+cp tests/wpt/suite/tools/certs/web-platform.test.key tools/wpt/certs/web-platform.test.key
+cp tests/wpt/suite/tools/certs/web-platform.test.pem tools/wpt/certs/web-platform.test.pem
 ```
diff --git a/tools/wpt/config.json b/tools/wpt/config.json
index 3bcd6612c..4b2a914f9 100644
--- a/tools/wpt/config.json
+++ b/tools/wpt/config.json
@@ -3,9 +3,9 @@
   "ssl": {
     "type": "pregenerated",
     "pregenerated": {
-      "ca_cert_path": "../../tools/wpt/certs/cacert.pem",
-      "host_cert_path": "../../tools/wpt/certs/web-platform.test.pem",
-      "host_key_path": "../../tools/wpt/certs/web-platform.test.key"
+      "ca_cert_path": "../../../tools/wpt/certs/cacert.pem",
+      "host_cert_path": "../../../tools/wpt/certs/web-platform.test.pem",
+      "host_key_path": "../../../tools/wpt/certs/web-platform.test.key"
     }
   }
 }
diff --git a/tools/wpt/runner.ts b/tools/wpt/runner.ts
index 2da3a95de..ee2fc2b74 100644
--- a/tools/wpt/runner.ts
+++ b/tools/wpt/runner.ts
@@ -11,7 +11,7 @@ export async function runWithTestUtil<T>(
     "wpt",
     "serve",
     "--config",
-    "../../tools/wpt/config.json",
+    "../../../tools/wpt/config.json",
   ], {
     stdout: verbose ? "inherit" : "piped",
     stderr: verbose ? "inherit" : "piped",
@@ -31,7 +31,11 @@ export async function runWithTestUtil<T>(
     }
     const passedTime = performance.now() - start;
     if (passedTime > 15000) {
-      proc.kill("SIGINT");
+      try {
+        proc.kill("SIGINT");
+      } catch {
+        // Might have already died
+      }
       await proc.status;
       throw new Error("Timed out while trying to start wpt test util.");
     }
@@ -43,7 +47,11 @@ export async function runWithTestUtil<T>(
     return await f();
   } finally {
     if (verbose) console.log("Killing wpt test util.");
-    proc.kill("SIGINT");
+    try {
+      proc.kill("SIGINT");
+    } catch {
+      // Might have already died
+    }
     await proc.status;
   }
 }
diff --git a/tools/wpt/utils.ts b/tools/wpt/utils.ts
index aa1d6d115..bc25505bd 100644
--- a/tools/wpt/utils.ts
+++ b/tools/wpt/utils.ts
@@ -130,7 +130,7 @@ export function runPy<T extends Omit<Deno.CommandOptions, "cwd">>(
     stdout: "inherit",
     stderr: "inherit",
     ...options,
-    cwd: join(ROOT_PATH, "./test_util/wpt/"),
+    cwd: join(ROOT_PATH, "./tests/wpt/suite/"),
   }).spawn();
 }
 
@@ -181,13 +181,13 @@ export async function generateRunInfo(): Promise<unknown> {
   };
   const proc = await new Deno.Command("git", {
     args: ["rev-parse", "HEAD"],
-    cwd: join(ROOT_PATH, "test_util", "wpt"),
+    cwd: join(ROOT_PATH, "tests", "wpt", "suite"),
     stderr: "inherit",
   }).output();
   const revision = (new TextDecoder().decode(proc.stdout)).trim();
   const proc2 = await new Deno.Command(denoBinary(), {
     args: ["eval", "console.log(JSON.stringify(Deno.version))"],
-    cwd: join(ROOT_PATH, "test_util", "wpt"),
+    cwd: join(ROOT_PATH, "tests", "wpt", "suite"),
   }).output();
   const version = JSON.parse(new TextDecoder().decode(proc2.stdout));
   const runInfo = {