diff --git a/kokoro/ubuntu/continuous-bazel.cfg b/kokoro/ubuntu/continuous-bazel.cfg
new file mode 100644
index 0000000..5a48a4f
--- /dev/null
+++ b/kokoro/ubuntu/continuous-bazel.cfg
@@ -0,0 +1 @@
+build_file: "re2/kokoro/ubuntu/continuous-bazel.sh"
diff --git a/kokoro/ubuntu/continuous.sh b/kokoro/ubuntu/continuous-bazel.sh
similarity index 100%
rename from kokoro/ubuntu/continuous.sh
rename to kokoro/ubuntu/continuous-bazel.sh
diff --git a/kokoro/ubuntu/continuous.cfg b/kokoro/ubuntu/continuous.cfg
deleted file mode 100644
index e3fac42..0000000
--- a/kokoro/ubuntu/continuous.cfg
+++ /dev/null
@@ -1 +0,0 @@
-build_file: "re2/kokoro/ubuntu/continuous.sh"
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous-cmake.bat
similarity index 77%
rename from kokoro/windows/continuous.bat
rename to kokoro/windows/continuous-cmake.bat
index 87eb3b8..8f0f293 100755
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous-cmake.bat
@@ -2,10 +2,10 @@
 
 cmake -D CMAKE_BUILD_TYPE=Debug -A x64 .                            || EXIT /B 1
 cmake --build . --config Debug --clean-first                        || EXIT /B 1
-ctest -C Debug -E dfa^|exhaustive^|random --output-on-failure       || EXIT /B 1
+ctest -C Debug --output-on-failure -E dfa^|exhaustive^|random       || EXIT /B 1
 
 cmake -D CMAKE_BUILD_TYPE=Release -A x64 .                          || EXIT /B 1
 cmake --build . --config Release --clean-first                      || EXIT /B 1
-ctest -C Release -E dfa^|exhaustive^|random --output-on-failure     || EXIT /B 1
+ctest -C Release --output-on-failure -E dfa^|exhaustive^|random     || EXIT /B 1
 
 EXIT /B 0
diff --git a/kokoro/windows/continuous-cmake.cfg b/kokoro/windows/continuous-cmake.cfg
new file mode 100644
index 0000000..cc6d4aa
--- /dev/null
+++ b/kokoro/windows/continuous-cmake.cfg
@@ -0,0 +1 @@
+build_file: "re2/kokoro/windows/continuous-cmake.bat"
diff --git a/kokoro/windows/continuous.cfg b/kokoro/windows/continuous.cfg
deleted file mode 100644
index b18e4fc..0000000
--- a/kokoro/windows/continuous.cfg
+++ /dev/null
@@ -1 +0,0 @@
-build_file: "re2/kokoro/windows/continuous.bat"