diff --git a/Makefile b/Makefile
index fe0f752d..1acad00f 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,6 @@ docker_push:
 	docker push ${project}
 test:
 	fkbeta/manage.py test fkbeta
-	python utils/test_*.py
+	python3 utils/test_*.py
 	utils/run-move_and_process
 	upload/test-fkupload
diff --git a/upload/test-fkupload b/upload/test-fkupload
index 388b5b3f..65e20f69 100755
--- a/upload/test-fkupload
+++ b/upload/test-fkupload
@@ -4,7 +4,7 @@ set -e
 
 cleanup() {
     for pid in $pids; do
-	if kill -0 $pid ; then
+	if kill -0 $pid >/dev/null 2>&1; then
 	    kill $pid
 	else
 	    echo "Process $pid already exited, not killed"
@@ -53,3 +53,5 @@ if [ ! -z $(diff $test_file $uploaded_file) ]; then
     ls -l $uploaded_file
     exit 99
 fi
+
+exit 0