diff --git a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh b/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
index 5b9d757ee26a..20760e2418f2 100755
--- a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
@@ -17,6 +17,8 @@
 
 #suite:misc
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
index bc4bf6c66614..8241c86d8e2e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ec.sh
@@ -17,6 +17,8 @@
 
 #suite:balancer
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE0}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 export OM_SERVICE_ID="om"
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
index 2c5091c64f5a..be29eaf8393e 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/test-ratis.sh
@@ -17,6 +17,8 @@
 
 #suite:balancer
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 export OM_SERVICE_ID="om"
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
index e56cacd813b9..1fe220a720bf 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -u -o pipefail
+
 COMPOSE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh
index 40a12b85e195..a0d19fd673c0 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-hadoop.sh
@@ -17,6 +17,8 @@
 
 #suite:MR
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
index 976e490d32ca..6c09e7b76158 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
@@ -17,6 +17,8 @@
 
 #suite:HA-unsecure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/test.sh
index 11b8f0ffd3d6..ce7378a3d65f 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-om-prepare/test.sh
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-topology/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-topology/test.sh
index 458f307dcf2d..f12e30e84885 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-topology/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-topology/test.sh
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
index e7d882f1a36a..ca850cec1942 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
@@ -17,6 +17,8 @@
 
 #suite:EC
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-failures1.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-failures1.sh
index b44fed22d3b4..7529993a43e8 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-failures1.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-failures1.sh
@@ -17,6 +17,8 @@
 
 #suite:failing
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-failures2.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-failures2.sh
index ea0c2fe899a8..86968f6f9d70 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-failures2.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-failures2.sh
@@ -17,6 +17,8 @@
 
 #suite:failing
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh
index e687fac5ada3..fbb41dbfa9a9 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-hadoop.sh
@@ -17,6 +17,8 @@
 
 #suite:MR
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-legacy-bucket.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-legacy-bucket.sh
index b657ae19eab6..004e2d4a0c38 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-legacy-bucket.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-legacy-bucket.sh
@@ -17,6 +17,8 @@
 
 #suite:unsecure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test-s3a.sh b/hadoop-ozone/dist/src/main/compose/ozone/test-s3a.sh
index c277e71a4bf0..d4419bb6f688 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/test-s3a.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-s3a.sh
@@ -17,6 +17,8 @@
 
 #suite:s3a
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 85606553e2c2..4a98d0f44cbd 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -17,6 +17,8 @@
 
 #suite:unsecure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh b/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
index d26d649f17bb..49df5cb847bd 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonescripts/test.sh
@@ -17,6 +17,8 @@
 
 #suite:misc
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh
index 1ab13ce6ff14..b3839578e982 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh
@@ -17,6 +17,8 @@
 
 #suite:leadership
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-om-bootstrap.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-om-bootstrap.sh
index 2a8b7cb8b394..d6e0a5da3090 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-om-bootstrap.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-om-bootstrap.sh
@@ -47,6 +47,8 @@
 #   * the keys are read from the snapshot and not the active file system
 #   * the contents of each key should be the same as the key name
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3a.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3a.sh
index 78b8b51d9d81..b2b3c5fbda00 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3a.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3a.sh
@@ -17,6 +17,8 @@
 
 #suite:s3a
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
index 0d05f19014ff..93f6ea1363a5 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
@@ -17,6 +17,8 @@
 
 #suite:misc
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
index bf1bcd3f816a..4bca81f69ef0 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
@@ -17,6 +17,8 @@
 
 #suite:leadership
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
index 50b9ad6cfcda..515b354e593a 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
@@ -17,6 +17,8 @@
 
 #suite:HA-secure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh
index c63f7ee7345f..3cc8d82fcaff 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/test.sh
@@ -17,6 +17,8 @@
 
 #suite:MR
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-certificate-rotation.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-certificate-rotation.sh
index bf97125cf09f..0cd7dbc0b753 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-certificate-rotation.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-certificate-rotation.sh
@@ -17,6 +17,8 @@
 
 #suite:cert-rotation
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
index 039b122f6bb9..be75137d4daa 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-ec.sh
@@ -17,6 +17,8 @@
 
 #suite:EC
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-fcq.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-fcq.sh
index a9e87a60cddd..e960bd6fb720 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-fcq.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-fcq.sh
@@ -17,6 +17,8 @@
 
 #suite:secure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-haproxy-s3g.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-haproxy-s3g.sh
index 3318a69cb25b..80470b16978d 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-haproxy-s3g.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-haproxy-s3g.sh
@@ -17,6 +17,8 @@
 
 #suite:secure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-root-ca-rotation.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-root-ca-rotation.sh
index 818ac303e4a5..7b6b20e20823 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-root-ca-rotation.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-root-ca-rotation.sh
@@ -17,6 +17,8 @@
 
 #suite:cert-rotation
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
index f3e8bb8e65c0..0d1fa16a927f 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
@@ -17,6 +17,8 @@
 
 #suite:misc
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
index 407418a2ef11..426537955224 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
@@ -17,6 +17,8 @@
 
 #suite:secure
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
@@ -66,4 +68,4 @@ docker-compose up -d --scale datanode=3
 execute_robot_test scm -v container:1 -v count:3 replication/wait.robot
 
 #test public key and certificate recovery
-source "$COMPOSE_DIR/public-key-cert-recovery-test.sh"
\ No newline at end of file
+source "$COMPOSE_DIR/public-key-cert-recovery-test.sh"
diff --git a/hadoop-ozone/dist/src/main/compose/restart/test.sh b/hadoop-ozone/dist/src/main/compose/restart/test.sh
index cd5aad1aa7a2..eb7ddef48fcc 100755
--- a/hadoop-ozone/dist/src/main/compose/restart/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/restart/test.sh
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/test-all.sh b/hadoop-ozone/dist/src/main/compose/test-all.sh
index adc6853d43c1..8e93b240f356 100755
--- a/hadoop-ozone/dist/src/main/compose/test-all.sh
+++ b/hadoop-ozone/dist/src/main/compose/test-all.sh
@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -u -o pipefail
 
 #
 # Test executor to test all the compose/*/test.sh test scripts.
@@ -49,7 +50,7 @@ fi
 
 if [[ "${OZONE_ACCEPTANCE_TEST_TYPE}" == "robot" ]]; then
   # does not apply to JUnit tests run via Maven
-  generate_report "acceptance" "${ALL_RESULT_DIR}" "${XUNIT_RESULT_DIR}"
+  generate_report "acceptance" "${ALL_RESULT_DIR}" "${XUNIT_RESULT_DIR:-}"
 fi
 
 exit $RESULT
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 0f274b3d8514..5be27b18a670 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -14,23 +14,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-set -e -o pipefail
+
+set -e -u -o pipefail
 
 _testlib_this="${BASH_SOURCE[0]}"
 _testlib_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+: "${COMPOSE_DIR:=$_testlib_dir}"
 COMPOSE_ENV_NAME=$(basename "$COMPOSE_DIR")
 RESULT_DIR=${RESULT_DIR:-"$COMPOSE_DIR/result"}
-RESULT_DIR_INSIDE="/tmp/smoketest/$(basename "$COMPOSE_ENV_NAME")/result"
-
-OM_HA_PARAM=""
-if [[ -n "${OM_SERVICE_ID}" ]] && [[ "${OM_SERVICE_ID}" != "om" ]]; then
-  OM_HA_PARAM="--om-service-id=${OM_SERVICE_ID}"
-fi
 
 source ${_testlib_dir}/compose_v2_compatibility.sh
 source "${_testlib_dir}/../smoketest/testlib.sh"
 
 : ${OZONE_COMPOSE_RUNNING:=false}
+: ${SECURITY_ENABLED:=false}
 : ${SCM:=scm}
 
 # version is used in bucket name, which does not allow uppercase
@@ -71,7 +69,7 @@ all_tests_in_immediate_child_dirs() {
 ## @description Find all test*.sh scripts in immediate child dirs,
 ## @description applying OZONE_ACCEPTANCE_SUITE or OZONE_TEST_SELECTOR filter.
 find_tests(){
-  if [[ -n "${OZONE_ACCEPTANCE_SUITE}" ]]; then
+  if [[ -n "${OZONE_ACCEPTANCE_SUITE:-}" ]]; then
     tests=$(all_tests_in_immediate_child_dirs | xargs grep -l "^#suite:${OZONE_ACCEPTANCE_SUITE}$" || echo "")
 
      # 'misc' is default suite, add untagged tests, too
@@ -86,7 +84,7 @@ find_tests(){
       echo "No tests found for suite ${OZONE_ACCEPTANCE_SUITE}"
       exit 1
     fi
-  elif [[ -n "${OZONE_TEST_SELECTOR}" ]]; then
+  elif [[ -n "${OZONE_TEST_SELECTOR:-}" ]]; then
     tests=$(all_tests_in_immediate_child_dirs | grep "${OZONE_TEST_SELECTOR}" || echo "")
 
     if [[ -z "${tests}" ]]; then
@@ -215,22 +213,29 @@ execute_robot_test(){
     fi
   done
 
-  SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest"
+  : ${OZONE_DIR:=/opt/hadoop}
+  SMOKETEST_DIR_INSIDE="$OZONE_DIR/smoketest"
 
+  RESULT_DIR_INSIDE="/tmp/smoketest/$COMPOSE_ENV_NAME/result"
   OUTPUT_PATH="$RESULT_DIR_INSIDE/${OUTPUT_FILE}"
 
+  OM_HA_PARAM=""
+  if [[ -n "${OM_SERVICE_ID:-}" ]] && [[ "${OM_SERVICE_ID}" != "om" ]]; then
+    OM_HA_PARAM="--om-service-id=${OM_SERVICE_ID}"
+  fi
+
   set +e
 
   # shellcheck disable=SC2068
   docker-compose exec -T "$CONTAINER" mkdir -p "$RESULT_DIR_INSIDE" \
     && docker-compose exec -T "$CONTAINER" robot \
-      -v ENCRYPTION_KEY:"${OZONE_BUCKET_KEY_NAME}" \
+      -v ENCRYPTION_KEY:"${OZONE_BUCKET_KEY_NAME:-}" \
       -v OM_HA_PARAM:"${OM_HA_PARAM}" \
       -v OM_SERVICE_ID:"${OM_SERVICE_ID:-om}" \
       -v OZONE_DIR:"${OZONE_DIR}" \
       -v SECURITY_ENABLED:"${SECURITY_ENABLED}" \
       -v SCM:"${SCM}" \
-      ${ARGUMENTS[@]} --log NONE --report NONE "${OZONE_ROBOT_OPTS[@]}" --output "$OUTPUT_PATH" \
+      ${ARGUMENTS[@]} --log NONE --report NONE --output "$OUTPUT_PATH" \
       "$SMOKETEST_DIR_INSIDE/$TEST"
   local -i rc=$?
 
@@ -319,7 +324,7 @@ create_containers() {
 }
 
 get_output_name() {
-  if [[ -n "${OUTPUT_NAME}" ]]; then
+  if [[ -n "${OUTPUT_NAME:-}" ]]; then
     echo "${OUTPUT_NAME}-"
   fi
 }
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
index 100aba983970..20f0e02d4995 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -17,6 +17,7 @@
 
 #suite:upgrade
 
+set -u -o pipefail
 
 TEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )
 source "$TEST_DIR/testlib.sh"
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
index b7604ed04fdb..fa7218d9bc24 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
@@ -19,13 +19,13 @@ COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 basename=$(basename ${COMPOSE_DIR})
 
+# shellcheck source=hadoop-ozone/dist/src/main/compose/testlib.sh
+source "${COMPOSE_DIR}/../testlib.sh"
+
 current_version="${OZONE_CURRENT_VERSION}"
 # TODO: debug acceptance test failures for client versions 1.0.0 on secure clusters
 old_versions="1.1.0 1.2.1 1.3.0 1.4.0 1.4.1" # container is needed for each version in clients.yaml
 
-# shellcheck source=hadoop-ozone/dist/src/main/compose/testlib.sh
-source "${COMPOSE_DIR}/../testlib.sh"
-
 export SECURITY_ENABLED=true
 : ${OZONE_BUCKET_KEY_NAME:=key1}
 
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh b/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
index 3acea6b7932f..ef8c3ef36cdf 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
@@ -17,6 +17,8 @@
 
 #suite:compat-new
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR
 
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
index d54b555262f1..f6c69ef6f17f 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
@@ -17,6 +17,8 @@
 
 #suite:compat-old
 
+set -u -o pipefail
+
 COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export COMPOSE_DIR