diff --git a/.github/workflows/ci-test-cpp.yml b/.github/workflows/ci-test-cpp.yml
index 25c655468a2..e64c83dc8a6 100644
--- a/.github/workflows/ci-test-cpp.yml
+++ b/.github/workflows/ci-test-cpp.yml
@@ -35,9 +35,17 @@ jobs:
         # Share repository cache between workflows.
         repository-cache: true
 
-    - name: Run unit tests
+    - 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