diff --git a/test/TEST-01-BASIC/Makefile b/test/TEST-01-BASIC/Makefile
index 45e9bfc67c..79fe9688b8 100644
--- a/test/TEST-01-BASIC/Makefile
+++ b/test/TEST-01-BASIC/Makefile
@@ -1,9 +1,6 @@
 BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
 
-all setup run:
+all setup run clean clean-again:
 	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
 
-clean clean-again:
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --clean
-
 .PHONY: all setup run clean clean-again
diff --git a/test/TEST-13-NSPAWN-SMOKE/Makefile b/test/TEST-13-NSPAWN-SMOKE/Makefile
deleted file mode 100644
index e5e3350211..0000000000
--- a/test/TEST-13-NSPAWN-SMOKE/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-BUILD_DIR=$(shell ../../tools/find-build-dir.sh)
-
-all setup run:
-	@basedir=../.. TEST_BASE_DIR=../ BUILD_DIR=$(BUILD_DIR) ./test.sh --$@
-
-clean clean-again:
-	@basedir=../.. TEST_BASE_DIR=../ ./test.sh --clean
-	@rm -f has-overflow
-
-.PHONY: all setup run clean clean-again
diff --git a/test/TEST-13-NSPAWN-SMOKE/Makefile b/test/TEST-13-NSPAWN-SMOKE/Makefile
new file mode 120000
index 0000000000..e9f93b1104
--- /dev/null
+++ b/test/TEST-13-NSPAWN-SMOKE/Makefile
@@ -0,0 +1 @@
+../TEST-01-BASIC/Makefile
\ No newline at end of file
diff --git a/test/test-functions b/test/test-functions
index 64afa8e3f1..d1595fcd60 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -2039,7 +2039,7 @@ do_test() {
                 test_setup
                 test_setup_cleanup
                 ;;
-            --clean)
+            --clean|--clean-again)
                 echo "TEST CLEANUP: $TEST_DESCRIPTION"
                 test_cleanup
                 ;;