diff --git a/qtest/Makefile b/qtest/Makefile
index c8a9751..177e0a8 100644
--- a/qtest/Makefile
+++ b/qtest/Makefile
@@ -7,9 +7,12 @@ QTESTABLE=$(filter-out $(DONTTEST), \
 	)
 
 qtest-gen:
+	@rm run_qtest.ml || true
 	@if which qtest > /dev/null ; then \
 		qtest extract --preamble $(QTEST_PREAMBLE) \
 			-o run_qtest.ml \
 			$(QTESTABLE) 2> /dev/null ; \
-	else touch qtest/run_qtest.ml ; \
+	else touch run_qtest.ml ; \
 	fi
+
+.PHONY: qtest-gen
diff --git a/qtest/jbuild b/qtest/jbuild
index 0843466..ad96b55 100644
--- a/qtest/jbuild
+++ b/qtest/jbuild
@@ -1,7 +1,7 @@
 
 (rule
   ((targets (run_qtest.ml))
-   (deps ((file Makefile) )) ; (glob_files ../src/**/*.ml{,i})))
+   (deps ((file Makefile) (files_recursively_in ../src))) ; (glob_files ../src/**/*.ml{,i})))
    (fallback)
    ;(libraries (qtest qcheck))
    (action