diff --git a/kokoro/macos/cpp/build.sh b/kokoro/macos/cpp/build.sh
deleted file mode 100755
index 9c3b8aa156..0000000000
--- a/kokoro/macos/cpp/build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-set -eux
-set -o pipefail
-
-# Run from the project root directory.
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-#
-# Run build
-#
-bazel test $(kokoro/common/bazel_flags.sh) //src/...
diff --git a/kokoro/macos/cpp/common.cfg b/kokoro/macos/cpp/common.cfg
deleted file mode 100644
index 26515517a9..0000000000
--- a/kokoro/macos/cpp/common.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/cpp/build.sh"
-timeout_mins: 1440
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 77103
-      keyname: "kokoro_gcp_service"
-    }
-  }
-}
-bazel_setting {
-  project_id: "protobuf-build"
-  bes_backend_address: "buildeventservice.googleapis.com"
-  foundry_backend_address: "remotebuildexecution.googleapis.com"
-  upsalite_frontend_address: "https://source.cloud.google.com"
-  local_execution: true
-
-  # Need to be same as the fetch_keystore entry in the previous step.
-  auth_credential: {
-    keystore_config_id: 77103
-    keyname: "kokoro_gcp_service"
-  }
-}
diff --git a/kokoro/macos/cpp/continuous.cfg b/kokoro/macos/cpp/continuous.cfg
deleted file mode 100644
index 8523c22536..0000000000
--- a/kokoro/macos/cpp/continuous.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Keep this file empty! Use common.cfg instead.
diff --git a/kokoro/macos/cpp/presubmit.cfg b/kokoro/macos/cpp/presubmit.cfg
deleted file mode 100644
index 8523c22536..0000000000
--- a/kokoro/macos/cpp/presubmit.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Keep this file empty! Use common.cfg instead.
diff --git a/kokoro/windows/bazel/build.bat b/kokoro/windows/bazel/build.bat
deleted file mode 100644
index 1916406d99..0000000000
--- a/kokoro/windows/bazel/build.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@rem enter repo root
-cd /d %~dp0\..\..\..
-
-call kokoro\windows\prepare_build_win64.bat || goto :error
-
-@rem Build libraries first.
-bazel %BAZEL_STARTUP% build //:protoc //:protobuf //:protobuf_lite %BAZEL_FLAGS% || goto :error
-
-@rem Run C++ tests.
-@rem TODO(b/241484899) Enable conformance tests on windows.
-bazel %BAZEL_STARTUP% test %BAZEL_FLAGS% ^
-  --test_tag_filters=-conformance --build_tag_filters=-conformance ^
-  //src/...  @com_google_protobuf_examples//... || goto :error
-
-goto :EOF
-
-:error
-echo Failed!
-exit /b 1
diff --git a/kokoro/windows/bazel/common.cfg b/kokoro/windows/bazel/common.cfg
deleted file mode 100644
index 52703cc16f..0000000000
--- a/kokoro/windows/bazel/common.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/windows/bazel/build.bat"
-timeout_mins: 1440
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 77103
-      keyname: "kokoro_gcp_service"
-    }
-  }
-}
-bazel_setting {
-  project_id: "protobuf-build"
-  bes_backend_address: "buildeventservice.googleapis.com"
-  foundry_backend_address: "remotebuildexecution.googleapis.com"
-  upsalite_frontend_address: "https://source.cloud.google.com"
-  local_execution: true
-
-  # Need to be same as the fetch_keystore entry in the previous step.
-  auth_credential: {
-    keystore_config_id: 77103
-    keyname: "kokoro_gcp_service"
-  }
-}
diff --git a/kokoro/windows/bazel/continuous.cfg b/kokoro/windows/bazel/continuous.cfg
deleted file mode 100644
index 8523c22536..0000000000
--- a/kokoro/windows/bazel/continuous.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Keep this file empty! Use common.cfg instead.
diff --git a/kokoro/windows/bazel/presubmit.cfg b/kokoro/windows/bazel/presubmit.cfg
deleted file mode 100644
index 8523c22536..0000000000
--- a/kokoro/windows/bazel/presubmit.cfg
+++ /dev/null
@@ -1 +0,0 @@
-# Keep this file empty! Use common.cfg instead.