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