diff --git a/makefile b/makefile
index ea03f993e5de1dbc19606e3dae4804b0e4c6bf7a..49c65fbf7cd92e2100bd41d337464ee8e9033a3d 100644
--- a/makefile
+++ b/makefile
@@ -56,7 +56,10 @@ test: easy-units
 	mvn test -X
 
 test_misc:
-	cd misc/bend_symlinks/ && /bin/bash -c /usr/bin/shunit2 test/test_suite.sh
+	cd misc/bend_symlinks/ && ./bend_symlinks.sh -h && test/test_suite.sh | tee test_output
+	cat misc/bend_symlinks/test_output | grep "Ran 10 tests."
+	cat misc/bend_symlinks/test_output | grep "OK"
+	rm misc/bend_symlinks/test_output
 
 clean: clean-antlr
 	mvn clean
diff --git a/misc/bend_symlinks/README.md b/misc/bend_symlinks/README.md
index f72357f8636a2cf961434108a52e98ef05181e62..a1fa833e262b47e619237bf79db77c1d4b2421a5 100644
--- a/misc/bend_symlinks/README.md
+++ b/misc/bend_symlinks/README.md
@@ -103,4 +103,4 @@
 
 Run test suite with
 
-    $ shunit2 test/test_suite.sh
+    $ ./test/test_suite.sh
diff --git a/misc/bend_symlinks/test/test_suite.sh b/misc/bend_symlinks/test/test_suite.sh
old mode 100644
new mode 100755
index 781e477e1ffacda36b12687ec05ebf5c9d021e15..9ffa6b1fffe9ec095ebbc3a25bdfa5ee767e1a69
--- a/misc/bend_symlinks/test/test_suite.sh
+++ b/misc/bend_symlinks/test/test_suite.sh
@@ -1,8 +1,9 @@
+#!/bin/bash
 
-
-source "./src/utils.sh"
+source ./src/utils.sh
 set +o errexit
 
+
 BEND=./bend_symlinks.sh
 FILE_SYSTEM_ROOT=test_dir/links
 DATA_DIR=test_dir/original
@@ -226,4 +227,4 @@ testSymlinkToSymlink () {
 
 }
 
-
+source shunit2