diff --git a/kokoro/macos/ruby23/build.sh b/kokoro/macos/ruby23/build.sh
new file mode 100755
index 0000000000..dc950a20d4
--- /dev/null
+++ b/kokoro/macos/ruby23/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Build file to set up and run tests
+
+# Change to repo root
+cd $(dirname $0)/../../..
+
+# Prepare worker environment to run tests
+source kokoro/macos/prepare_build_macos_rc
+
+./tests.sh ruby23
diff --git a/kokoro/macos/ruby23/continuous.cfg b/kokoro/macos/ruby23/continuous.cfg
new file mode 100644
index 0000000000..c9b1f61284
--- /dev/null
+++ b/kokoro/macos/ruby23/continuous.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby23/build.sh"
+timeout_mins: 1440
diff --git a/kokoro/macos/ruby23/presubmit.cfg b/kokoro/macos/ruby23/presubmit.cfg
new file mode 100644
index 0000000000..c9b1f61284
--- /dev/null
+++ b/kokoro/macos/ruby23/presubmit.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby23/build.sh"
+timeout_mins: 1440
diff --git a/kokoro/macos/ruby24/build.sh b/kokoro/macos/ruby24/build.sh
new file mode 100755
index 0000000000..3c3a190d9d
--- /dev/null
+++ b/kokoro/macos/ruby24/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Build file to set up and run tests
+
+# Change to repo root
+cd $(dirname $0)/../../..
+
+# Prepare worker environment to run tests
+source kokoro/macos/prepare_build_macos_rc
+
+./tests.sh ruby24
diff --git a/kokoro/macos/ruby24/continuous.cfg b/kokoro/macos/ruby24/continuous.cfg
new file mode 100644
index 0000000000..fada028fc5
--- /dev/null
+++ b/kokoro/macos/ruby24/continuous.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby24/build.sh"
+timeout_mins: 1440
diff --git a/kokoro/macos/ruby24/presubmit.cfg b/kokoro/macos/ruby24/presubmit.cfg
new file mode 100644
index 0000000000..fada028fc5
--- /dev/null
+++ b/kokoro/macos/ruby24/presubmit.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby24/build.sh"
+timeout_mins: 1440
diff --git a/kokoro/macos/ruby25/build.sh b/kokoro/macos/ruby25/build.sh
new file mode 100755
index 0000000000..38e90aa75c
--- /dev/null
+++ b/kokoro/macos/ruby25/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Build file to set up and run tests
+
+# Change to repo root
+cd $(dirname $0)/../../..
+
+# Prepare worker environment to run tests
+source kokoro/macos/prepare_build_macos_rc
+
+./tests.sh ruby25
diff --git a/kokoro/macos/ruby25/continuous.cfg b/kokoro/macos/ruby25/continuous.cfg
new file mode 100644
index 0000000000..b3755e4104
--- /dev/null
+++ b/kokoro/macos/ruby25/continuous.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby25/build.sh"
+timeout_mins: 1440
diff --git a/kokoro/macos/ruby25/presubmit.cfg b/kokoro/macos/ruby25/presubmit.cfg
new file mode 100644
index 0000000000..b3755e4104
--- /dev/null
+++ b/kokoro/macos/ruby25/presubmit.cfg
@@ -0,0 +1,5 @@
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos/ruby25/build.sh"
+timeout_mins: 1440
diff --git a/tests.sh b/tests.sh
index df41bc5a61..d5ac6e5ceb 100755
--- a/tests.sh
+++ b/tests.sh
@@ -265,8 +265,6 @@ build_ruby25() {
   cd ruby && bash travis-test.sh ruby-2.5.0 && cd ..
 }
 build_ruby_all() {
-  build_ruby21
-  build_ruby22
   build_ruby23
   build_ruby24
   build_ruby25
@@ -575,6 +573,9 @@ Usage: $0 { cpp |
             python_compatibility |
             ruby21 |
             ruby22 |
+            ruby23 |
+            ruby24 |
+            ruby25 |
             jruby |
             ruby_all |
             php5.5   |