diff --git a/helpers/assert_device_present b/helpers/assert_device_present
index 18d83af..3d89f38 100755
--- a/helpers/assert_device_present
+++ b/helpers/assert_device_present
@@ -1,18 +1,17 @@
 #!/bin/sh
 
+source /usr/bin/bootrr
+
 TEST_CASE_ID="$1"
 DRIVER="$2"
 DEVICE="$3"
+TIMEOUT="${4:-1}"
 
 if [ -z "${TEST_CASE_ID}" -o -z "${DRIVER}" -o -z "${DEVICE}" ]; then
-	echo "Usage: $0 <test-case-id> <driver> <device>"
+	echo "Usage: $0 <test-case-id> <driver> <device> [<timeout>]"
 	exit 1
 fi
 
-if [ -L /sys/bus/*/drivers/${DRIVER}/${DEVICE} ]; then
-	TEST_RESULT="pass"
-else
-	TEST_RESULT="fail"
-fi
+timeout ${TIMEOUT} [ -L /sys/bus/*/drivers/${DRIVER}/${DEVICE} ] || test_report_exit fail
 
-lava-test-case "${TEST_CASE_ID}" --result ${TEST_RESULT}
+test_report_exit pass
diff --git a/helpers/bootrr b/helpers/bootrr
new file mode 100644
index 0000000..20975c4
--- /dev/null
+++ b/helpers/bootrr
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+timeout() {
+	attempts="$1"; shift
+	cmd="$@"
+
+	for i in `seq ${attempts}`
+	do
+		$cmd && return 0 
+		sleep 1
+	done
+
+	return 1
+}
+
+test_report_exit() {
+	TEST_RESULT=$1
+	lava-test-case ${TEST_CASE_ID} --result ${TEST_RESULT}
+	exit 0
+}
+