diff --git a/Makefile b/Makefile
index 5297aed0..c8f7d5c1 100644
--- a/Makefile
+++ b/Makefile
@@ -166,8 +166,7 @@ unit-race:
 
 flakehunter: build
 	@$(call print, "Flake hunting integration tests.")
-	$(ITEST)
-	while [ $$? -eq 0 ]; do /bin/sh -c "$(ITEST)"; done
+	while [ $$? -eq 0 ]; do $(ITEST); done
 
 flake-unit:
 	@$(call print, "Flake hunting unit tests.")
diff --git a/make/testing_flags.mk b/make/testing_flags.mk
index a9de0c88..0180f85b 100644
--- a/make/testing_flags.mk
+++ b/make/testing_flags.mk
@@ -44,4 +44,4 @@ endif
 
 # Construct the integration test command with the added build flags.
 ITEST_TAGS := $(TEST_TAGS) rpctest
-ITEST := $(GOTEST) -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput
+ITEST := rm output*.log; date; $(GOTEST) -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput