diff --git a/LibOS/shim/test/fs/Makefile b/LibOS/shim/test/fs/Makefile
index 147c77d1..6089e957 100644
--- a/LibOS/shim/test/fs/Makefile
+++ b/LibOS/shim/test/fs/Makefile
@@ -34,8 +34,8 @@ test: $(target)
 	$(RM) fs-test.xml
 	$(MAKE) fs-test.xml
 
-fs-test.xml:
-	python3 -m pytest --junit-xml $@ -v test_fs.py
+fs-test.xml: test_fs.py $(call expand_target_to_token,$(target))
+	python3 -m pytest --junit-xml $@ -v $<
 
 .PHONY: clean-tmp
 clean-tmp:
diff --git a/LibOS/shim/test/regression/Makefile b/LibOS/shim/test/regression/Makefile
index 16e805f1..528e1d72 100644
--- a/LibOS/shim/test/regression/Makefile
+++ b/LibOS/shim/test/regression/Makefile
@@ -48,8 +48,8 @@ regression: $(target)
 	$(RM) libos-regression.xml
 	$(MAKE) libos-regression.xml
 
-libos-regression.xml:
-	python3 -m pytest --junit-xml $@ -v test_libos.py
+libos-regression.xml: test_libos.py $(call expand_target_to_token,$(target))
+	python3 -m pytest --junit-xml $@ -v $<
 
 .PHONY: clean-tmp
 clean-tmp:
diff --git a/Pal/regression/Makefile b/Pal/regression/Makefile
index af6ce424..c30ba874 100644
--- a/Pal/regression/Makefile
+++ b/Pal/regression/Makefile
@@ -108,7 +108,7 @@ regression:
 	$(MAKE) pal-regression.xml
 
 pal-regression.xml: test_pal.py $(call expand_target_to_token,$(target))
-	python3 -m pytest --junit-xml $@ -v test_pal.py
+	python3 -m pytest --junit-xml $@ -v $<
 
 .PHONY: clean
 clean: