diff --git a/test/Makefile b/test/Makefile
index 14c8cd2..7416afc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -76,7 +76,7 @@
 	@touch $@
 
 define retest-func
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)"
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && setsid scripts/run_with_cleanup.sh python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)"
 endef
 
 .PHONY: sanity
diff --git a/test/scripts/run_with_cleanup.sh b/test/scripts/run_with_cleanup.sh
new file mode 100755
index 0000000..dcaa58b
--- /dev/null
+++ b/test/scripts/run_with_cleanup.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+rv=0
+
+atexit() {
+	group_id=`ps -p $$ -o pgid=`
+	my_id=$$
+	ids=`pgrep -g $group_id -d ' ' | sed "s/\b$my_id\b//g"`
+	echo "Killing possible remaining process IDs: $ids"
+	for id in $ids
+	do
+		if ps -p $id > /dev/null
+		then
+			kill -9 $id
+		fi
+	done
+	exit $rv
+}
+
+trap "atexit" SIGINT SIGTERM
+
+$*
+rv=$?
+atexit
+exit $rv