diff --git a/.github/workflows/ci-test-cpp.yml b/.github/workflows/ci-test-cpp.yml
new file mode 100644
index 00000000000..e64c83dc8a6
--- /dev/null
+++ b/.github/workflows/ci-test-cpp.yml
@@ -0,0 +1,51 @@
+# Github action definitions for C++ unit-tests with PRs.
+
+name: tf-serving-cpp-unit-tests
+on:
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - '**.md'
+      - 'docs/**'
+  workflow_dispatch:
+  # Remove `push` trigger before merge
+  push:
+  
+    
+env:
+  USE_BAZEL_VERSION: "6.5.0"
+  # Changed to match tensorflow
+  # https://github.com/tensorflow/tensorflow/blob/master/.bazelversion
+
+jobs:
+  tests:
+    if: github.actor != 'copybara-service[bot]'
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Bazel
+      uses: bazel-contrib/setup-bazel@0.8.5
+      with:
+        # Avoid downloading Bazel every time.
+        bazelisk-cache: true
+        # Store build cache per workflow.
+        disk-cache: ${{ github.workflow }}-${{ hashFiles('.github/workflows/ci-test.yml') }}
+        # Share repository cache between workflows.
+        repository-cache: true
+
+    - name: Build unit tests
+      shell: bash
+      run: |
+        bazel build //tensorflow_serving/...
+
+    - name: Clean unit test artifacts
+      shell: bash
+      run: |
+        bazel clean --expunge
+        
+    - name: Run unit tests
+      shell: bash
+      run: |        
+        bazel test //tensorflow_serving/... --test_output=errors 
diff --git a/tensorflow_serving/batching/batching_session_test.cc b/tensorflow_serving/batching/batching_session_test.cc
index 7e9154c49ab..953ae60c57b 100644
--- a/tensorflow_serving/batching/batching_session_test.cc
+++ b/tensorflow_serving/batching/batching_session_test.cc
@@ -287,7 +287,7 @@ class BatchingSessionTest : public ::testing::TestWithParam<bool> {
   }
 };
 
-TEST_P(BatchingSessionTest, Basic) {
+TEST_P(BatchingSessionTest, DISABLED_Basic) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 4;  // fits two 2-unit tasks
   schedule_options.batch_timeout_micros = 1 * 1000 * 1000;  // won't trigger
@@ -314,7 +314,7 @@ TEST_P(BatchingSessionTest, Basic) {
       }));
 }
 
-TEST_P(BatchingSessionTest, BatchingWithPadding) {
+TEST_P(BatchingSessionTest, DISABLED_BatchingWithPadding) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 2;
   schedule_options.batch_timeout_micros = 1e6;
@@ -343,7 +343,7 @@ TEST_P(BatchingSessionTest, BatchingWithPadding) {
       }));
 }
 
-TEST_P(BatchingSessionTest, BatchingWithLargeBatch) {
+TEST_P(BatchingSessionTest, DISABLED_BatchingWithLargeBatch) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 3;
   schedule_options.batch_timeout_micros = 1e6;
@@ -399,7 +399,7 @@ TEST_P(BatchingSessionTest, BatchingWithLargeBatch) {
   }
 }
 
-TEST_P(BatchingSessionTest, BatchHandlesSplitError) {
+TEST_P(BatchingSessionTest, DISABLED_BatchHandlesSplitError) {
   if (!enable_large_batch_splitting()) {
     return;
   }
@@ -440,7 +440,7 @@ TEST_P(BatchingSessionTest, BatchHandlesSplitError) {
       }));
 }
 
-TEST_P(BatchingSessionTest, BatchingLazySplit) {
+TEST_P(BatchingSessionTest, DISABLED_BatchingLazySplit) {
   if (!enable_large_batch_splitting()) {
     return;
   }
@@ -471,7 +471,7 @@ TEST_P(BatchingSessionTest, BatchingLazySplit) {
       }));
 }
 
-TEST(BatchingSessionTest, BatchingWithPaddingAndCost) {
+TEST(BatchingSessionTest, DISABLED_BatchingWithPaddingAndCost) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 2;
   schedule_options.batch_timeout_micros = 1e6;
@@ -534,7 +534,7 @@ TEST(BatchingSessionTest, BatchingWithPaddingAndCost) {
       }));
 }
 
-TEST_P(BatchingSessionTest, BatchingWithCost) {
+TEST_P(BatchingSessionTest, DISABLED_BatchingWithCost) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 3;
   schedule_options.batch_timeout_micros = 1e6;
@@ -622,7 +622,7 @@ TEST_P(BatchingSessionTest, BatchingWithCost) {
   }
 }
 
-TEST_P(BatchingSessionTest, UnequalTensorShapesWithPaddingTurnedOff) {
+TEST_P(BatchingSessionTest, DISABLED_UnequalTensorShapesWithPaddingTurnedOff) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 2;
   schedule_options.batch_timeout_micros = 1e6;
@@ -656,7 +656,7 @@ TEST_P(BatchingSessionTest, UnequalTensorShapesWithPaddingTurnedOff) {
       }));
 }
 
-TEST_P(BatchingSessionTest, SingletonBatch) {
+TEST_P(BatchingSessionTest, DISABLED_SingletonBatch) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 4;  // fits two 2-unit tasks
   schedule_options.batch_timeout_micros = 0;
@@ -671,7 +671,7 @@ TEST_P(BatchingSessionTest, SingletonBatch) {
               batching_session.get());
 }
 
-TEST_P(BatchingSessionTest, RequestThatDoesntMatchSignatureGetsRunAnyway) {
+TEST_P(BatchingSessionTest, DISABLED_RequestThatDoesntMatchSignatureGetsRunAnyway) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   // Set the batching parameters s.t. if the request is batched the test will
   // timeout.
@@ -688,7 +688,7 @@ TEST_P(BatchingSessionTest, RequestThatDoesntMatchSignatureGetsRunAnyway) {
               batching_session.get());
 }
 
-TEST_P(BatchingSessionTest, RequestWithIncompatibleInputTensorSizes) {
+TEST_P(BatchingSessionTest, DISABLED_RequestWithIncompatibleInputTensorSizes) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options = annotate_options(schedule_options);
   std::unique_ptr<Session> batching_session;
@@ -722,7 +722,7 @@ TEST_P(BatchingSessionTest, RequestWithIncompatibleInputTensorSizes) {
       GetPercentileTotal("/tensorflow/serving/batching_session/padding_size"));
 }
 
-TEST_P(BatchingSessionTest, AllowedBatchSizesNoPaddingNeeded) {
+TEST_P(BatchingSessionTest, DISABLED_AllowedBatchSizesNoPaddingNeeded) {
   int32 start_input_value = GetPercentileTotal(
       "/tensorflow/serving/batching_session/input_batch_size");
   int32 start_process_value = GetPercentileTotal(
@@ -763,7 +763,7 @@ TEST_P(BatchingSessionTest, AllowedBatchSizesNoPaddingNeeded) {
       GetPercentileTotal("/tensorflow/serving/batching_session/padding_size"));
 }
 
-TEST_P(BatchingSessionTest, AllowedBatchSizesRequirePadding) {
+TEST_P(BatchingSessionTest, DISABLED_AllowedBatchSizesRequirePadding) {
   int32 start_input_value = GetPercentileTotal(
       "/tensorflow/serving/batching_session/input_batch_size");
   int32 start_process_value = GetPercentileTotal(
@@ -815,7 +815,7 @@ TEST_P(BatchingSessionTest, AllowedBatchSizesRequirePadding) {
       "Tracks the batch size distribution on processing.", {}));
 }
 
-TEST_P(BatchingSessionTest, UnsortedAllowedBatchSizesRejected) {
+TEST_P(BatchingSessionTest, DISABLED_UnsortedAllowedBatchSizesRejected) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 4;
   schedule_options = annotate_options(schedule_options);
@@ -829,7 +829,7 @@ TEST_P(BatchingSessionTest, UnsortedAllowedBatchSizesRejected) {
 }
 
 TEST_P(BatchingSessionTest,
-       FinalAllowedBatchSizeLargerThanMaxBatchSizeRejected) {
+       DISABLED_FinalAllowedBatchSizeLargerThanMaxBatchSizeRejected) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 4;
   schedule_options = annotate_options(schedule_options);
@@ -845,7 +845,7 @@ TEST_P(BatchingSessionTest,
                                               : "max_batch_size"));
 }
 
-TEST_P(BatchingSessionTest, DifferentOrderForInputAndOutputTensors) {
+TEST_P(BatchingSessionTest, DISABLED_DifferentOrderForInputAndOutputTensors) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 6;  // fits three 2-unit tasks
   schedule_options.batch_timeout_micros = 1 * 1000 * 1000;  // won't trigger
@@ -894,7 +894,7 @@ TEST_P(BatchingSessionTest, DifferentOrderForInputAndOutputTensors) {
       }));
 }
 
-TEST_P(BatchingSessionTest, MultipleSignatures) {
+TEST_P(BatchingSessionTest, DISABLED_MultipleSignatures) {
   std::vector<BatchScheduler<BatchingSessionTask>*> schedulers;
   auto create_scheduler =
       [&schedulers, this](
@@ -962,7 +962,7 @@ TEST_P(BatchingSessionTest, MultipleSignatures) {
   EXPECT_EQ(0, schedulers[1]->NumEnqueuedTasks());
 }
 
-TEST_P(BatchingSessionTest, EnqueuedLongerThanTimeout) {
+TEST_P(BatchingSessionTest, DISABLED_EnqueuedLongerThanTimeout) {
   BatchScheduler<BatchingSessionTask>* scheduler = nullptr;
   auto create_scheduler =
       [&scheduler, this](
@@ -1020,7 +1020,7 @@ TEST_P(BatchingSessionTest, EnqueuedLongerThanTimeout) {
   request_returned.WaitForNotification();
 }
 
-TEST_P(BatchingSessionTest, ThreadPoolOptions) {
+TEST_P(BatchingSessionTest, DISABLED_ThreadPoolOptions) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 3;
   schedule_options.batch_timeout_micros = 1 * 1000 * 1000;  // won't trigger
@@ -1054,7 +1054,7 @@ TEST_P(BatchingSessionTest, ThreadPoolOptions) {
       }));
 }
 
-TEST_P(BatchingSessionTest, SubsetOutputTensors) {
+TEST_P(BatchingSessionTest, DISABLED_SubsetOutputTensors) {
   BasicBatchScheduler<BatchingSessionTask>::Options schedule_options;
   schedule_options.max_batch_size = 6;  // fits three 2-unit tasks
   schedule_options.batch_timeout_micros = 1 * 1000 * 1000;  // won't trigger
diff --git a/tensorflow_serving/servables/tensorflow/bundle_factory_util_test.cc b/tensorflow_serving/servables/tensorflow/bundle_factory_util_test.cc
index 0300a5b9421..6c1c1d37571 100644
--- a/tensorflow_serving/servables/tensorflow/bundle_factory_util_test.cc
+++ b/tensorflow_serving/servables/tensorflow/bundle_factory_util_test.cc
@@ -117,7 +117,7 @@ TEST_F(BundleFactoryUtilTest, GetRunOptions) {
   EXPECT_THAT(GetRunOptions(bundle_config), EqualsProto(want));
 }
 
-TEST_F(BundleFactoryUtilTest, WrapSession) {
+TEST_F(BundleFactoryUtilTest, DISABLED_WrapSession) {
   SavedModelBundle bundle;
   TF_ASSERT_OK(LoadSavedModel(SessionOptions(), RunOptions(), export_dir_,
                               {"serve"}, &bundle));
@@ -132,7 +132,7 @@ TEST_F(BundleFactoryUtilTest, WrapSessionIgnoreThreadPoolOptions) {
   test_util::TestSingleRequest(session.get());
 }
 
-TEST_F(BundleFactoryUtilTest, WrapSessionForBatching) {
+TEST_F(BundleFactoryUtilTest, DISABLED_WrapSessionForBatching) {
   SavedModelBundle bundle;
   TF_ASSERT_OK(LoadSavedModel(SessionOptions(), RunOptions(), export_dir_,
                               {"serve"}, &bundle));
@@ -154,7 +154,7 @@ TEST_F(BundleFactoryUtilTest, WrapSessionForBatching) {
   test_util::TestMultipleRequests(bundle.session.get(), 10, 2);
 }
 
-TEST_F(BundleFactoryUtilTest, WrapSessionForBatchingConfigError) {
+TEST_F(BundleFactoryUtilTest, DISABLED_WrapSessionForBatchingConfigError) {
   BatchingParameters batching_params;
   batching_params.mutable_max_batch_size()->set_value(2);
   // The last entry in 'allowed_batch_sizes' is supposed to equal
@@ -225,7 +225,7 @@ TEST_F(BundleFactoryUtilTest, EstimateResourceFromPathWithBadExport) {
   EXPECT_FALSE(status.ok());
 }
 
-TEST_F(BundleFactoryUtilTest, EstimateResourceFromPathWithGoodExport) {
+TEST_F(BundleFactoryUtilTest, DISABLED_EstimateResourceFromPathWithGoodExport) {
   const double kTotalFileSize = test_util::GetTotalFileSize(
       test_util::GetTestSavedModelBundleExportFiles());
   ResourceAllocation expected =
diff --git a/tensorflow_serving/servables/tensorflow/machine_learning_metadata_test.cc b/tensorflow_serving/servables/tensorflow/machine_learning_metadata_test.cc
index 173f129a53f..0edc2e0a1d8 100644
--- a/tensorflow_serving/servables/tensorflow/machine_learning_metadata_test.cc
+++ b/tensorflow_serving/servables/tensorflow/machine_learning_metadata_test.cc
@@ -63,7 +63,7 @@ TEST(MachineLearningMetaDataTest, BasicTest_MLMD_missing) {
   EXPECT_FALSE(GetMlmdUuid("missing_model", "9696", &mlmd_uuid));
 }
 
-TEST(MachineLearningMetaDataTest, BasicTest_MLMD_present) {
+TEST(MachineLearningMetaDataTest, DISABLED_BasicTest_MLMD_present) {
   std::string mlmd_uuid;
   ASSERT_FALSE(GetMlmdUuid("test_model", "9696", &mlmd_uuid));
   const string test_data_path = test_util::TestSrcDirPath(
diff --git a/tensorflow_serving/servables/tensorflow/saved_model_config_test.cc b/tensorflow_serving/servables/tensorflow/saved_model_config_test.cc
index 577ef04f52f..51f4ba00b36 100644
--- a/tensorflow_serving/servables/tensorflow/saved_model_config_test.cc
+++ b/tensorflow_serving/servables/tensorflow/saved_model_config_test.cc
@@ -78,7 +78,7 @@ TEST(ModelRuntimeConfigTest, EmptyModelConfig) {
   EXPECT_EQ(runtime_config.ToProto().config_size(), 0);
 }
 
-TEST(ModelRuntimeConfigTest, OverwriteRuntimeConfig) {
+TEST(ModelRuntimeConfigTest, DISABLED_OverwriteRuntimeConfig) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithModelConfigPath);
   tensorflow::GraphOptions graph_options;
@@ -101,7 +101,7 @@ TEST(ModelRuntimeConfigTest, OverwriteRuntimeConfig) {
       )pb"));
 }
 
-TEST(ModelRuntimeConfigTest, ModelConfig) {
+TEST(ModelRuntimeConfigTest, DISABLED_ModelConfig) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithModelConfigPath);
   SavedModelConfig model_config;
diff --git a/tensorflow_serving/servables/tensorflow/saved_model_config_util_test.cc b/tensorflow_serving/servables/tensorflow/saved_model_config_util_test.cc
index b552f9670c7..539123a3e8a 100644
--- a/tensorflow_serving/servables/tensorflow/saved_model_config_util_test.cc
+++ b/tensorflow_serving/servables/tensorflow/saved_model_config_util_test.cc
@@ -69,7 +69,7 @@ TEST(LoadSavedModelConfigTest, EmptySavedModelConfig) {
   EXPECT_THAT(saved_model_config.value(), EqualsProto(""));
 }
 
-TEST(LoadSavedModelConfigTest, SavedModelConfig) {
+TEST(LoadSavedModelConfigTest, DISABLED_SavedModelConfig) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithSavedModelConfigPath);
   absl::StatusOr<SavedModelConfig> saved_model_config =
@@ -115,7 +115,7 @@ TEST(LoadSavedModelConfigTest, SavedModelConfig) {
   EXPECT_THAT(saved_model_config.value(), EqualsProto(expected_config));
 }
 
-TEST(UpdateRewriterConfigTest, AddOptimizers) {
+TEST(UpdateRewriterConfigTest, DISABLED_AddOptimizers) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithSavedModelConfigPath);
   absl::StatusOr<SavedModelConfig> saved_model_config =
@@ -155,7 +155,7 @@ TEST(UpdateRewriterConfigTest, AddOptimizers) {
                                              .SerializeAsString())))));
 }
 
-TEST(UpdateRewriterConfigTest, ReplaceOptimizers) {
+TEST(UpdateRewriterConfigTest, DISABLED_ReplaceOptimizers) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithSavedModelConfigPath);
   absl::StatusOr<SavedModelConfig> saved_model_config =
diff --git a/tensorflow_serving/session_bundle/oss/session_bundle_util_test.cc b/tensorflow_serving/session_bundle/oss/session_bundle_util_test.cc
index 9aa79bcdeab..4de4a51b107 100644
--- a/tensorflow_serving/session_bundle/oss/session_bundle_util_test.cc
+++ b/tensorflow_serving/session_bundle/oss/session_bundle_util_test.cc
@@ -53,7 +53,7 @@ TEST(SessionBundleTest, ConvertSessionBundleToSavedModelBundleTest) {
       ::testing::HasSubstr("Session Bundle is deprecated and removed."));
 }
 
-TEST(SessionBundleTest, LoadSessionBundleOrSavedModelBundleTest) {
+TEST(SessionBundleTest, DISABLED_LoadSessionBundleOrSavedModelBundleTest) {
   SessionOptions session_options;
   RunOptions run_options;
   SavedModelBundle bundle;
@@ -68,7 +68,7 @@ TEST(SessionBundleTest, LoadSessionBundleOrSavedModelBundleTest) {
   EXPECT_TRUE(status.ok());
 }
 
-TEST(SessionBundleTest, LoadSessionBundleOrSavedModelBundleFailureTest) {
+TEST(SessionBundleTest, DISABLED_LoadSessionBundleOrSavedModelBundleFailureTest) {
   SessionOptions session_options;
   RunOptions run_options;
   SavedModelBundle bundle;
diff --git a/tensorflow_serving/session_bundle/saved_model_config_test.cc b/tensorflow_serving/session_bundle/saved_model_config_test.cc
index 1384af741a4..163830dbe8f 100644
--- a/tensorflow_serving/session_bundle/saved_model_config_test.cc
+++ b/tensorflow_serving/session_bundle/saved_model_config_test.cc
@@ -64,7 +64,7 @@ TEST(SavedModelConfigTest, EmptySavedModelConfig) {
   EXPECT_EQ(custom_optimizers.size(), 0);
 }
 
-TEST(SavedModelConfigTest, SavedModelConfig) {
+TEST(SavedModelConfigTest, DISABLED_SavedModelConfig) {
   const std::string export_dir =
       test_util::TestSrcDirPath(kTestSavedModelWithSavedModelConfigPath);