diff --git a/fence/agents/dummy/fence_dummy.py b/fence/agents/dummy/fence_dummy.py
index 661c7ca4..932009eb 100644
--- a/fence/agents/dummy/fence_dummy.py
+++ b/fence/agents/dummy/fence_dummy.py
@@ -1,143 +1,145 @@
 #!/usr/bin/python -tt
 
 import sys, random
 import logging
 import time
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
-from fencing import fail_usage
+from fencing import fail_usage, run_delay
 
 #BEGIN_VERSION_GENERATION
 RELEASE_VERSION="New Dummy Agent - test release on steroids"
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION
 
 plug_status = "on"
 
 def get_power_status_file(conn, options):
 	del conn
 
 	try:
 		status_file = open(options["--status-file"], 'r')
 	except Exception:
 		return "off"
 
 	status = status_file.read()
 	status_file.close()
 
 	return status.lower()
 
 def set_power_status_file(conn, options):
 	del conn
 
 	if not (options["--action"] in ["on", "off"]):
 		return
 
 	status_file = open(options["--status-file"], 'w')
 	status_file.write(options["--action"])
 	status_file.close()
 
 def get_power_status_fail(conn, options):
 	outlets = get_outlets_fail(conn, options)
 
 	if len(outlets) == 0 or not options.has_key("--plug"):
 		fail_usage("Failed: You have to enter existing machine!")
 	else:
 		return outlets[options["--plug"]][0]
 
 def set_power_status_fail(conn, options):
 	global plug_status
 	del conn
 
 	plug_status = "unknown"
 	if options["--action"] == "on":
 		plug_status = "off"
 
 def get_outlets_fail(conn, options):
 	del conn
 
 	result = {}
 	global plug_status
 
 	if options["--action"] == "on":
 		plug_status = "off"
 
 	# This fake agent has no port data to list, so we have to make
 	# something up for the list action.
 	if options.get("--action", None) == "list":
 		result["fake_port_1"] = [plug_status, "fake"]
 		result["fake_port_2"] = [plug_status, "fake"]
 	elif not options.has_key("--plug"):
 		fail_usage("Failed: You have to enter existing machine!")
 	else:
 		port = options["--plug"]
 		result[port] = [plug_status, "fake"]
 
 	return result
 
 def main():
 	device_opt = ["no_password", "status_file", "random_sleep_range", "type", "port"]
 
 	atexit.register(atexit_handler)
 
 	all_opt["status_file"] = {
 		"getopt" : ":",
 		"longopt" : "status-file",
 		"help":"--status-file=[file]           Name of file that holds current status",
 		"required" : "0",
 		"shortdesc" : "File with status",
 		"default" : "/tmp/fence_dummy.status",
 		"order": 1
 		}
 
 	all_opt["random_sleep_range"] = {
 		"getopt" : ":",
 		"longopt" : "random_sleep_range",
 		"help":"--random_sleep_range=[seconds] Issue a sleep between 1 and [seconds]",
 		"required" : "0",
 		"shortdesc" : "Issue a sleep between 1 and X seconds. Used for testing.",
 		"order": 1
 		}
 
 	all_opt["type"] = {
 		"getopt" : ":",
 		"longopt" : "type",
 		"help":"--type=[type]                  Possible types are: file and fail",
 		"required" : "0",
 		"shortdesc" : "Type of the dummy fence agent",
 		"default" : "file",
 		"order": 1
 		}
 
 	pinput = process_input(device_opt)
 	if (pinput.has_key("--type") and pinput["--type"] == "file") or (pinput.has_key("--type") == False):
 		# hack to have fence agents that require ports 'fail' and one that do not 'file'
 		device_opt.remove("port")
 		device_opt.remove("separator")
 
 	options = check_input(device_opt, process_input(device_opt))
 
 	docs = {}
 	docs["shortdesc"] = "Dummy fence agent"
 	docs["longdesc"] = "fence_dummy"
 	docs["vendorurl"] = "http://www.example.com"
 	show_docs(options, docs)
 
+	run_delay(options)
+
 	# random sleep for testing
 	if options.has_key("--random_sleep_range"):
 		val = int(options["--random_sleep_range"])
 		ran = random.randint(1, val)
 		logging.info("Random sleep for %d seconds\n", ran)
 		time.sleep(ran)
 
 	if options["--type"] == "fail":
 		result = fence_action(None, options, set_power_status_fail, get_power_status_fail, get_outlets_fail)
 	else:
 		result = fence_action(None, options, set_power_status_file, get_power_status_file, None)
 
 	sys.exit(result)
 
 if __name__ == "__main__":
 	main()
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index 9803b1da..45dcefbc 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,30 +1,30 @@
 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 || \
+	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) --
+	python ./$(INPUT) --delay 0 $(FENCE_TEST_ARGS) --; false )
 
 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 -