diff --git a/make/agentccheck.mk b/make/agentccheck.mk
index 46e2055d..9f7a8b4f 100644
--- a/make/agentccheck.mk
+++ b/make/agentccheck.mk
@@ -1,22 +1,22 @@
-TEMPFILE:=$(shell mktemp)
 DATADIR:=$(abs_top_srcdir)/tests/data/metadata
 
 check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%)
 
 xml-check.%: %
 	$(eval INPUT=$(subst xml-check.,,$@))
+	$(eval TEMPFILE = $(shell mktemp))
 	./$(INPUT) -o metadata > $(TEMPFILE)
 	diff $(TEMPFILE) $(DATADIR)/$(INPUT).xml
 	rm $(TEMPFILE)
 
 xml-upload.%: %
 	$(eval INPUT=$(subst xml-upload.,,$@))
 	./$(INPUT) -o metadata > $(DATADIR)/$(INPUT).xml
 
 # If test will fail, rerun fence agents to show problems
 delay-check.%: %
 	$(eval INPUT=$(subst delay-check.,,$@))
 	test `/usr/bin/time -f "%e" ./$(INPUT) --delay 10 $(FENCE_TEST_ARGS) -- 2>&1 |\
 	sed 's/\.//' | tail -n 1` -ge 1000 || \
 	/usr/bin/time -f "%e" ./$(INPUT) --delay 0 $(FENCE_TEST_ARGS) --
 
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index ba573f95..9803b1da 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,31 +1,30 @@
-TEMPFILE:=$(shell mktemp)
-#DATADIR:=$(abs_top_builddir)/tests/data/metadata
 DATADIR:=$(abs_top_srcdir)/tests/data/metadata
 AWK_VAL='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}'
 
 check: $(TARGET:%=xml-check.%) $(SYMTARGET:%=xml-check.%) $(TARGET:%=delay-check.%) $(TARGET:%=rng-check.%)
 
 xml-check.%: %
 	$(eval INPUT=$(subst xml-check.,,$@))
+	$(eval TEMPFILE = $(shell mktemp))
 	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(TEMPFILE)
 	diff $(TEMPFILE) $(DATADIR)/$(INPUT).xml
 	rm $(TEMPFILE)
 
 xml-upload.%: %
 	$(eval INPUT=$(subst xml-upload.,,$@))
 	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$(INPUT).xml
 
 # If test will fail, rerun fence agents to show problems
 delay-check.%: %
 	$(eval INPUT=$(subst delay-check.,,$@))
 	test `PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib /usr/bin/time -f "%e" \
 	python ./$(INPUT) --delay 10 $(FENCE_TEST_ARGS) -- 2>&1 |\
 	sed 's/\.//' | tail -n 1` -ge 1000 || \
 	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib /usr/bin/time -f "%e" \
 	python ./$(INPUT) --delay 0 $(FENCE_TEST_ARGS) --
 
 rng-check.%: %
 	PYTHONPATH=$(abs_srcdir)/../lib:$(abs_builddir)/../lib python ./$(INPUT) -o metadata | \
 	/usr/bin/xsltproc ${abs_top_srcdir}/fence/agents/lib/fence2rng.xsl - | \
 	sed -e 's/ rha:description=/ description=/g' -e 's/ rha:name=/ name=/g' | \
 	xmllint --nsclean --noout -