diff --git a/tools/dev/bin/cell-build b/tools/dev/bin/cell-build
index 5dacfe7591..3136c7217e 100755
--- a/tools/dev/bin/cell-build
+++ b/tools/dev/bin/cell-build
@@ -60,5 +60,5 @@ ssh -t -t $ONOS_USER@$OCN "
     # Run the build (neutralizing known environment mutations in SSH sessions)
     set -e
     [ $noBuild = false ] && SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 bazel build onos
-    [ $runTests = true ] && bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test
+    [ $runTests = true ] && bazel query 'tests(//...)' | SHLVL=1 SSH_CLIENT=0 SSH_CONNECTION=0 xargs bazel test || true
 "
diff --git a/tools/test/bin/stc-set-openjdk11 b/tools/test/bin/stc-set-openjdk11
index 47f70cf6ca..490ad1c496 100755
--- a/tools/test/bin/stc-set-openjdk11
+++ b/tools/test/bin/stc-set-openjdk11
@@ -9,6 +9,6 @@ for node in $nodes; do
     echo $node:
     ssh -n -o ConnectTimeout=3 -o PasswordAuthentication=no ${ONOS_USER}@$node "
         sudo update-java-alternatives -s java-1.11.0-openjdk-amd64
-        echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' > .bash_aliases
+        echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> .bash_aliases
     "
 done