diff --git a/kokoro/gcp_ubuntu/continuous.cfg b/kokoro/continuous.cfg
similarity index 85%
rename from kokoro/gcp_ubuntu/continuous.cfg
rename to kokoro/continuous.cfg
index e6552753c..a834db198 100644
--- a/kokoro/gcp_ubuntu/continuous.cfg
+++ b/kokoro/continuous.cfg
@@ -1,7 +1,7 @@
 # Location of bash script that runs the test.  The first directory in the path
 # is the directory where Kokoro will check out the repo.  The rest is the path
 # is the path to the test script.
-build_file: "repo/kokoro/gcp_ubuntu/run_tests.sh"
+build_file: "repo/kokoro/run_tests.sh"
 
 action {
   define_artifacts {
diff --git a/kokoro/gcp_ubuntu/presubmit.cfg b/kokoro/presubmit.cfg
similarity index 85%
rename from kokoro/gcp_ubuntu/presubmit.cfg
rename to kokoro/presubmit.cfg
index e6552753c..a834db198 100644
--- a/kokoro/gcp_ubuntu/presubmit.cfg
+++ b/kokoro/presubmit.cfg
@@ -1,7 +1,7 @@
 # Location of bash script that runs the test.  The first directory in the path
 # is the directory where Kokoro will check out the repo.  The rest is the path
 # is the path to the test script.
-build_file: "repo/kokoro/gcp_ubuntu/run_tests.sh"
+build_file: "repo/kokoro/run_tests.sh"
 
 action {
   define_artifacts {
diff --git a/kokoro/gcp_ubuntu/release-nightly.cfg b/kokoro/release-nightly.cfg
similarity index 82%
rename from kokoro/gcp_ubuntu/release-nightly.cfg
rename to kokoro/release-nightly.cfg
index cae10cb83..e5087b1cd 100644
--- a/kokoro/gcp_ubuntu/release-nightly.cfg
+++ b/kokoro/release-nightly.cfg
@@ -1,5 +1,5 @@
 # Location of bash script that builds a release.
-build_file: "repo/kokoro/gcp_ubuntu/run_build.sh"
+build_file: "repo/kokoro/run_build.sh"
 
 action {
   # Upload runsc binary and its checksum. It may be in multiple paths, so we
diff --git a/kokoro/gcp_ubuntu/run_build.sh b/kokoro/run_build.sh
similarity index 100%
rename from kokoro/gcp_ubuntu/run_build.sh
rename to kokoro/run_build.sh
diff --git a/kokoro/gcp_ubuntu/run_tests.sh b/kokoro/run_tests.sh
similarity index 100%
rename from kokoro/gcp_ubuntu/run_tests.sh
rename to kokoro/run_tests.sh