diff --git a/cibuild/cpu-ut/cpu-c-ut.sh b/cibuild/cpu-ut/cpu-c-ut.sh
index 63c4960dbe9..691dcb6559f 100755
--- a/cibuild/cpu-ut/cpu-c-ut.sh
+++ b/cibuild/cpu-ut/cpu-c-ut.sh
@@ -43,7 +43,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-cc-ut.sh b/cibuild/cpu-ut/cpu-cc-ut.sh
index f34f7c2f4fb..67a5d6f00fd 100755
--- a/cibuild/cpu-ut/cpu-cc-ut.sh
+++ b/cibuild/cpu-ut/cpu-cc-ut.sh
@@ -39,7 +39,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-contrib-ut.sh b/cibuild/cpu-ut/cpu-contrib-ut.sh
index 1235b61247e..69584f6516e 100755
--- a/cibuild/cpu-ut/cpu-contrib-ut.sh
+++ b/cibuild/cpu-ut/cpu-contrib-ut.sh
@@ -49,7 +49,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-core-ut.sh b/cibuild/cpu-ut/cpu-core-ut.sh
index d1b3e0def9c..881f7692b40 100755
--- a/cibuild/cpu-ut/cpu-core-ut.sh
+++ b/cibuild/cpu-ut/cpu-core-ut.sh
@@ -47,7 +47,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
diff --git a/cibuild/cpu-ut/cpu-examples-ut.sh b/cibuild/cpu-ut/cpu-examples-ut.sh
index 99a83e19945..8020de0ec95 100755
--- a/cibuild/cpu-ut/cpu-examples-ut.sh
+++ b/cibuild/cpu-ut/cpu-examples-ut.sh
@@ -39,7 +39,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-java-ut.sh b/cibuild/cpu-ut/cpu-java-ut.sh
index ac245f3937c..ec69c159176 100755
--- a/cibuild/cpu-ut/cpu-java-ut.sh
+++ b/cibuild/cpu-ut/cpu-java-ut.sh
@@ -39,7 +39,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-js-ut.sh b/cibuild/cpu-ut/cpu-js-ut.sh
index 0ec972dd894..d50001e3ca6 100755
--- a/cibuild/cpu-ut/cpu-js-ut.sh
+++ b/cibuild/cpu-ut/cpu-js-ut.sh
@@ -39,7 +39,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-python-ut.sh b/cibuild/cpu-ut/cpu-python-ut.sh
index 84b7e6b99c0..a7c4be74aba 100755
--- a/cibuild/cpu-ut/cpu-python-ut.sh
+++ b/cibuild/cpu-ut/cpu-python-ut.sh
@@ -65,7 +65,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/cpu-ut/cpu-stream_executor-ut.sh b/cibuild/cpu-ut/cpu-stream_executor-ut.sh
index c1830ff2de6..2ae41fdd26f 100755
--- a/cibuild/cpu-ut/cpu-stream_executor-ut.sh
+++ b/cibuild/cpu-ut/cpu-stream_executor-ut.sh
@@ -39,7 +39,7 @@ export TF_BUILD_BAZEL_TARGET="$TF_ALL_TARGETS "\
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
+    bazel test -c opt --config=opt --verbose_failures --local_test_jobs=40 --test_output=errors -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
 exit $ret
\ No newline at end of file
diff --git a/cibuild/gpu-ut/gpu-c-ut.sh b/cibuild/gpu-ut/gpu-c-ut.sh
index f7d7180a999..5393176cd14 100755
--- a/cibuild/gpu-ut/gpu-c-ut.sh
+++ b/cibuild/gpu-ut/gpu-c-ut.sh
@@ -49,7 +49,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda \
     --verbose_failures --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-cc-ut.sh b/cibuild/gpu-ut/gpu-cc-ut.sh
index 8a90632e135..cba70143b2d 100755
--- a/cibuild/gpu-ut/gpu-cc-ut.sh
+++ b/cibuild/gpu-ut/gpu-cc-ut.sh
@@ -42,7 +42,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda \
     --verbose_failures --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-contrib-ut.sh b/cibuild/gpu-ut/gpu-contrib-ut.sh
index 93542187266..c3dfd574931 100755
--- a/cibuild/gpu-ut/gpu-contrib-ut.sh
+++ b/cibuild/gpu-ut/gpu-contrib-ut.sh
@@ -79,7 +79,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=1  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=1 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-core-ut.sh b/cibuild/gpu-ut/gpu-core-ut.sh
index 40fd7ce7489..7a4e7a2d89e 100755
--- a/cibuild/gpu-ut/gpu-core-ut.sh
+++ b/cibuild/gpu-ut/gpu-core-ut.sh
@@ -82,7 +82,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-examples-ut.sh b/cibuild/gpu-ut/gpu-examples-ut.sh
index aeb3fed013e..7d4ae30c8f9 100755
--- a/cibuild/gpu-ut/gpu-examples-ut.sh
+++ b/cibuild/gpu-ut/gpu-examples-ut.sh
@@ -43,7 +43,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="600,900,1200,3600" --local_test_jobs=5  \
+    --test_timeout="600,900,1200,3600" --local_test_jobs=5 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-java-ut.sh b/cibuild/gpu-ut/gpu-java-ut.sh
index 670a872554a..0acb3b6a818 100755
--- a/cibuild/gpu-ut/gpu-java-ut.sh
+++ b/cibuild/gpu-ut/gpu-java-ut.sh
@@ -42,7 +42,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-js-ut.sh b/cibuild/gpu-ut/gpu-js-ut.sh
index 541629f0f51..3a6f749c42a 100755
--- a/cibuild/gpu-ut/gpu-js-ut.sh
+++ b/cibuild/gpu-ut/gpu-js-ut.sh
@@ -42,7 +42,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-python-ut.sh b/cibuild/gpu-ut/gpu-python-ut.sh
index b967602ebf1..185dd694a2d 100755
--- a/cibuild/gpu-ut/gpu-python-ut.sh
+++ b/cibuild/gpu-ut/gpu-python-ut.sh
@@ -115,7 +115,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=20  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=20 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/gpu-ut/gpu-stream_executor-ut.sh b/cibuild/gpu-ut/gpu-stream_executor-ut.sh
index 6921e646637..e1141d7f014 100755
--- a/cibuild/gpu-ut/gpu-stream_executor-ut.sh
+++ b/cibuild/gpu-ut/gpu-stream_executor-ut.sh
@@ -43,7 +43,7 @@ for i in $(seq 1 3); do
     ret=0
     bazel test -c opt --config=cuda --verbose_failures \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute  \
-    --test_timeout="300,450,1200,3600" --local_test_jobs=80  \
+    --test_timeout="300,450,1200,3600" --local_test_jobs=80 --test_output=errors \
     -- $TF_BUILD_BAZEL_TARGET && break || ret=$?
 done
 
diff --git a/cibuild/serving-ut.sh b/cibuild/serving-ut.sh
index 85f26982683..c53b1a802bc 100755
--- a/cibuild/serving-ut.sh
+++ b/cibuild/serving-ut.sh
@@ -26,7 +26,7 @@ set -x
 for i in $(seq 1 3); do
     [ $i -gt 1 ] && echo "WARNING: cmd execution failed, will retry in $((i-1)) times later" && sleep 2
     ret=0
-    bazel test -- //serving/processor/... -//serving/processor/framework:lookup_manual_test && break || ret=$?
+    bazel test --test_output=errors -- //serving/processor/... -//serving/processor/framework:lookup_manual_test && break || ret=$?
 done
 
 exit $ret