diff --git a/tools/internal_ci/macos/grpc_basictests_c_cpp.cfg b/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg
similarity index 89%
rename from tools/internal_ci/macos/grpc_basictests_c_cpp.cfg
rename to tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg
index 53645ccf4b6..935bef11974 100644
--- a/tools/internal_ci/macos/grpc_basictests_c_cpp.cfg
+++ b/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg
@@ -27,5 +27,5 @@ action {
 
 env_vars {
   key: "RUN_TESTS_FLAGS"
-  value: "-f basictests macos corelang --internal_ci -j 4 --inner_jobs 8 --bq_result_table aggregate_results"
+  value: "-f basictests macos corelang dbg --internal_ci -j 4 --inner_jobs 8 --bq_result_table aggregate_results"
 }
diff --git a/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg b/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg
new file mode 100644
index 00000000000..64048508589
--- /dev/null
+++ b/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg
@@ -0,0 +1,31 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Config file for the internal CI (in protobuf text format)
+
+# Location of the continuous shell script in repository.
+build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh"
+gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
+timeout_mins: 240
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.*"
+    regex: "github/grpc/reports/**"
+  }
+}
+
+env_vars {
+  key: "RUN_TESTS_FLAGS"
+  value: "-f basictests macos corelang opt --internal_ci -j 4 --inner_jobs 8 --bq_result_table aggregate_results"
+}
diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg
similarity index 100%
rename from tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp.cfg
rename to tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg