diff --git a/etc/autobuild/ab3_defcfg.sh b/etc/autobuild/ab3_defcfg.sh
index 7bab38e..163d674 100644
--- a/etc/autobuild/ab3_defcfg.sh
+++ b/etc/autobuild/ab3_defcfg.sh
@@ -170,6 +170,6 @@ abassigngroup() {
 ABHOST_GROUP="$(abassigngroup $ABHOST)"
 
 # Default configurations for ab3 package integrity check module.
-[ -v $ABTEST_ENABLED ] || ABTEST_ENABLED=0 # Disabled during current development cycle
+[[ -v $ABTEST_ENABLED ]] || ABTEST_ENABLED=0 # Disabled during current development cycle
 
 unset -f abdetectarch abassigngroup
diff --git a/tests/01-self_files.sh b/tests/01-self_files.sh
index 49662e5..5296a76 100644
--- a/tests/01-self_files.sh
+++ b/tests/01-self_files.sh
@@ -19,7 +19,7 @@ abtest_self_files_test() {
         abinfo "Loading test case file ${i} and performing tests ..."
         . $i
         abtest || abtest_non-zero-handler $? $i
-        abtest_unprivileged || abtest_non-zero-handler $? $i
+        abtest_unprivileged || abtest_unprivileged_non-zero-handler $? $i
         unset abtest abtest_unprivileged
     done
 }