diff --git a/java/test.sh b/java/test.sh
index d9f55ebc3..d88645405 100755
--- a/java/test.sh
+++ b/java/test.sh
@@ -8,7 +8,8 @@ set -x
 ROOT_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
 run_testng() {
-    $@ || exit_code=$?
+    $@
+    local exit_code=$?
     # exit_code == 2 means there are skipped tests.
     if [ $exit_code -ne 2 ] && [ $exit_code -ne 0 ] ; then
         exit $exit_code