diff --git a/src/test/libpmempool_api/TEST9 b/src/test/libpmempool_api/TEST9
index 4548312352f92c9fc4c9b7a6c9e31deb64247883..5c22dcc7315778a8f5fc51e441141bfd1b28b42f 100755
--- a/src/test/libpmempool_api/TEST9
+++ b/src/test/libpmempool_api/TEST9
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@ rm -f $LOG_TEMP && touch $LOG_TEMP
 declare -A pool_args=(["log"]="log"
 	["blk"]="blk 512")
 
-for field in "${!pool_args[@]}";
+for field in log blk;
 do
 	echo "Pool type: ${field} Params: ${pool_args["$field"]}" >> $LOG_TEMP
 	expect_normal_exit $PMEMPOOL$EXESUFFIX create\
diff --git a/src/test/magic/TEST0 b/src/test/magic/TEST0
index 7389a90b3175b89fb449954c9b2fde126908a7dd..5c5f82cca054821338e5f9eb8b1d6287cbbe25d1 100755
--- a/src/test/magic/TEST0
+++ b/src/test/magic/TEST0
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -44,6 +44,8 @@ require_build_type nondebug
 # because even if it does report any problems we can't fix it
 configure_valgrind force-disable
 
+require_command file
+
 setup
 
 POOL=$DIR/file.pool
diff --git a/src/test/pmempool_info/TEST26 b/src/test/pmempool_info/TEST26
index 70989d860a1b96dfcf45513ca8f4421a719e7a16..e86991ea094bb1abb66d55da12150b1538228954 100755
--- a/src/test/pmempool_info/TEST26
+++ b/src/test/pmempool_info/TEST26
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018, Intel Corporation
+# Copyright 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,7 +48,7 @@ LOG=out${UNITTEST_NUM}.log
 expect_normal_exit $PMEMPOOL$EXESUFFIX create --layout "pmempool$SUFFIX" obj\
   $POOL
 expect_normal_exit $PMEMSPOIL $POOL \
-				   "pool_hdr.shutdown_state.dirty=1
+				   "pool_hdr.shutdown_state.dirty=1 \
 				   pool_hdr.shutdown_state.checksum_gen\(\)"
 expect_normal_exit $PMEMPOOL$EXESUFFIX info $POOL >> $LOG
 
diff --git a/src/test/rpmemd_config/TEST4 b/src/test/rpmemd_config/TEST4
index b9f9912b76afbaf8c31da8934fefd861e098e152..39fd6413c814e358bcf2b63d5b7cf28080e89236 100755
--- a/src/test/rpmemd_config/TEST4
+++ b/src/test/rpmemd_config/TEST4
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,21 +54,19 @@ EMPTY_CONFIG=$DIR/empty.conf
 touch $EMPTY_CONFIG
 
 function check_user_home_dir {
-	HOME_STR=\\\$HOME
-
 	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG print_HOME_env
 	cat $LOG >> $LOG_TEMP
 
-	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=$HOME_STR print_HOME_env
+	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME' print_HOME_env
 	cat $LOG >> $LOG_TEMP
 
-	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=prefix$HOME_STR print_HOME_env
+	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=prefix'\$HOME' print_HOME_env
 	cat $LOG >> $LOG_TEMP
 
-	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=${HOME_STR}stickysuffix print_HOME_env
+	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME'stickysuffix print_HOME_env
 	cat $LOG >> $LOG_TEMP
 
-	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=${HOME_STR}/suffix print_HOME_env
+	expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME'/suffix print_HOME_env
 	cat $LOG >> $LOG_TEMP
 }
 
diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
index b6358ba540df1409bea370c1b831ca4dc6cea6f2..f37b7d4f8bf875355653d41c9920c127299570c9 100644
--- a/src/test/unittest/unittest.sh
+++ b/src/test/unittest/unittest.sh
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018, Intel Corporation
+# Copyright 2014-2019, Intel Corporation
 # Copyright (c) 2016, Microsoft Corporation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -828,7 +828,7 @@ function expect_normal_exit() {
 	disable_exit_on_error
 
 	eval $ECHO LD_LIBRARY_PATH=$TEST_LD_LIBRARY_PATH LD_PRELOAD=$TEST_LD_PRELOAD \
-		$trace $*
+		$trace "$*"
 	ret=$?
 
 	if [ $REMOTE_VALGRIND_LOG -eq 1 ]; then
@@ -935,7 +935,7 @@ function expect_abnormal_exit() {
 
 	disable_exit_on_error
 	eval $ECHO ASAN_OPTIONS="detect_leaks=0 ${ASAN_OPTIONS}" \
-		LD_LIBRARY_PATH=$TEST_LD_LIBRARY_PATH LD_PRELOAD=$TEST_LD_PRELOAD $TRACE $*
+		LD_LIBRARY_PATH=$TEST_LD_LIBRARY_PATH LD_PRELOAD=$TEST_LD_PRELOAD $TRACE "$*"
 	ret=$?
 	restore_exit_on_error
 
@@ -1496,7 +1496,7 @@ function require_fs_name() {
 		fi
 	done
 
-	echo "$UNITTEST_NAME: SKIP file system $fsname ($* required)"
+	msg "$UNITTEST_NAME: SKIP file system $fsname ($* required)"
 	exit 0
 }