diff --git a/tests/test_counter.sh b/tests/test_counter.sh
index 8bbd8d37..99af772c 100644
--- a/tests/test_counter.sh
+++ b/tests/test_counter.sh
@@ -17,7 +17,7 @@ if [[ "$?" != 0 ]]; then
 fi
 
 sleep 1
-OUTPUT=`(tmsp batch) <<STDIN 
+OUTPUT=`(tmsp-cli batch) <<STDIN 
 set_option serial on
 get_hash
 append_tx abc
@@ -38,7 +38,7 @@ if [[ "${HASH1}" != "" ]]; then
 	exit 1
 fi
 
-OUTPUT=`(tmsp batch) <<STDIN 
+OUTPUT=`(tmsp-cli batch) <<STDIN 
 set_option serial on
 append_tx 0x00
 get_hash
diff --git a/tests/test_dummy.sh b/tests/test_dummy.sh
index b88475df..097db09d 100755
--- a/tests/test_dummy.sh
+++ b/tests/test_dummy.sh
@@ -5,7 +5,7 @@ echo "Dummy test ..."
 dummy &> /dev/null &
 PID=`echo $!`
 sleep 1
-RESULT_HASH=`tmsp get_hash`
+RESULT_HASH=`tmsp-cli get_hash`
 if [[ "$RESULT_HASH" != "" ]]; then
 	echo "Expected nothing but got: $RESULT_HASH"
 	exit 1
@@ -16,7 +16,7 @@ echo ""
 # Add a tx, get hash, commit, get hash
 # hashes should be non-empty and identical
 echo "Dummy batch test ..."
-OUTPUT=`(tmsp batch) <<STDIN 
+OUTPUT=`(tmsp-cli batch) <<STDIN 
 append_tx abc
 get_hash
 commit
@@ -31,6 +31,11 @@ if [[ "$HASH1" == "" ]]; then
 	exit 1
 fi
 
+if [[ "$HASH1" == "EOF" ]]; then
+	echo "Expected hash not broken connection!"
+	exit 1
+fi
+
 if [[ "$HASH1" != "$HASH2" ]]; then
 	echo "Expected hashes before and after commit to match: $HASH1, $HASH2"
 	exit 1
@@ -40,7 +45,7 @@ echo ""
 
 # Start a new connection and ensure the hash is the same
 echo "New connection test ..."
-RESULT_HASH=`tmsp get_hash`
+RESULT_HASH=`tmsp-cli get_hash`
 if [[ "$HASH1" != "$RESULT_HASH" ]]; then
 	echo "Expected hash to persist as $HASH1 for new connection. Got $RESULT_HASH"
 	exit 1