diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 23d9330..908ac5e 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -28,18 +28,18 @@
         {
             "label": "build.sh",
             "type": "shell",
-            "command": "kokoro/ubuntu/build.sh",
+            "command": "kokoro/build.sh",
             "problemMatcher": []
         },
         {
             "label": "test",
             "type": "shell",
-            "command": "make && kokoro/ubuntu/test.sh"
+            "command": "make && kokoro/test.sh"
         },
         {
             "label": "test on FVP",
             "type": "shell",
-            "command": "make && kokoro/ubuntu/test.sh --fvp"
+            "command": "make && kokoro/test.sh --fvp"
         },
         {
             "label": "push",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1efa7e5..d963e37 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,7 @@
 5.  Commit as usual. If you make a change in a submodule you will also need to
     commit a change in the main repository to update the submodule version.
 6.  Run the [tests](docs/Testing.md) and other presubmit checks with
-    `kokoro/ubuntu/build.sh`, ensure they all pass.
+    `kokoro/build.sh`, ensure they all pass.
 7.  Upload the change to Gerrit with `git push origin HEAD:refs/for/master`. If
     you have changed submodules then you'll need to push them as well.
 8.  If you changed submodules, then add a matching 'topic' from the Gerrit UI
diff --git a/docs/FVP.md b/docs/FVP.md
index 0db0bef..6a34f0f 100644
--- a/docs/FVP.md
+++ b/docs/FVP.md
@@ -19,7 +19,7 @@
 Hafnium checkout:
 
 ```shell
-$ make && kokoro/ubuntu/test.sh --fvp
+$ make && kokoro/test.sh --fvp
 ```
 
 See the `fvp` function in
diff --git a/docs/GettingStarted.md b/docs/GettingStarted.md
index 43ef6c5..bc090c7 100644
--- a/docs/GettingStarted.md
+++ b/docs/GettingStarted.md
@@ -89,7 +89,7 @@
 After building, presubmit tests can be run with the following command line:
 
 ```shell
-./kokoro/ubuntu/test.sh
+./kokoro/test.sh
 ```
 
 Read about [testing](Testing.md) for more details about the tests.
diff --git a/docs/HermeticBuild.md b/docs/HermeticBuild.md
index 1d3f66a..aee1444 100644
--- a/docs/HermeticBuild.md
+++ b/docs/HermeticBuild.md
@@ -68,9 +68,9 @@
 
 An arbitrary command can be executed inside the container with
 `build/run_in_container.sh [-i] <command> ...`. This is done automatically
-inside `Makefile` and `kokoro/ubuntu/build.sh` which detect whether they are
-already running inside the container and respawn themselves using
-`run_in_container.sh` if not.
+inside `Makefile` and `kokoro/build.sh` which detect whether they are already
+running inside the container and respawn themselves using `run_in_container.sh`
+if not.
 
 For example, you can spawn a shell with:
 
diff --git a/docs/Testing.md b/docs/Testing.md
index d79aafc..ae6e85a 100644
--- a/docs/Testing.md
+++ b/docs/Testing.md
@@ -42,13 +42,13 @@
 and lint errors. This can be run locally with:
 
 ```shell
-./kokoro/ubuntu/build.sh
+./kokoro/build.sh
 ```
 
 Or to just run the tests after having built everything manually run:
 
 ```shell
-./kokoro/ubuntu/test.sh
+./kokoro/test.sh
 ```
 
 ## QEMU tests