diff --git a/Makefile b/Makefile
index 03a7622a2734b..60f0318f71280 100644
--- a/Makefile
+++ b/Makefile
@@ -560,7 +560,8 @@ distcleanall: cleanall
 	julia-debug julia-release julia-stdlib julia-deps julia-deps-libs \
 	julia-ui-release julia-ui-debug julia-src-release julia-src-debug \
 	julia-symlink julia-base julia-sysimg julia-sysimg-ji julia-sysimg-release julia-sysimg-debug \
-	test testall testall1 test clean distcleanall cleanall clean-* \
+	test testall testall1 test test-* test-revise-* \
+	clean distcleanall cleanall clean-* \
 	run-julia run-julia-debug run-julia-release run \
 	install binary-dist light-source-dist.tmp light-source-dist \
 	dist full-source-dist source-dist
diff --git a/src/flisp/Makefile b/src/flisp/Makefile
index d97075eb68830..2158e2a5b2499 100644
--- a/src/flisp/Makefile
+++ b/src/flisp/Makefile
@@ -110,10 +110,12 @@ $(BUILDDIR)/host/Makefile:
 $(BUILDDIR)/host/$(EXENAME): $(BUILDDIR)/host/Makefile
 	make -C $(BUILDDIR)/host $(EXENAME)
 
-ifneq ($(BUILDDIR)$(BUILDING_HOST_TOOLS),.)
+ifneq ($(BUILDDIR),.)
+ifneq ($(BUILDDIR),$(SRCDIR))
 $(BUILDDIR)/flisp.boot: $(SRCDIR)/flisp.boot | $(BUILDDIR)
 	cp $< $@
 endif
+endif
 
 test:
 ifneq ($(USEMSVC), 1)
diff --git a/test/Makefile b/test/Makefile
index ae84dc0745caa..77a71c6d684d8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -25,9 +25,9 @@ $(TESTS):
 	@cd $(SRCDIR) && \
 	$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl $@)
 
-$(addprefix revise-, $(TESTS)):
+$(addprefix revise-, $(TESTS)): revise-% :
 	@cd $(SRCDIR) && \
-    $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl --revise $(subst revise-,,$@))
+    $(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no ./runtests.jl --revise $*)
 
 embedding:
 	@$(MAKE) -C $(SRCDIR)/$@ check $(EMBEDDING_ARGS)
@@ -39,4 +39,4 @@ clean:
 	@$(MAKE) -C embedding $@ $(EMBEDDING_ARGS)
 	@$(MAKE) -C gcext $@ $(GCEXT_ARGS)
 
-.PHONY: $(TESTS) embedding gcext clean
+.PHONY: $(TESTS) $(addprefix revise-, $(TESTS)) embedding gcext clean