diff --git a/test.block b/test.block
index f12c6f735c..f6011a2221 100644
--- a/test.block
+++ b/test.block
@@ -1,10 +1,12 @@
-#!/bin/sh
-export ACTION=add
-#export ACTION=remove
+#! /bin/sh
+#
+# test.block - run udev(8) on each block device in /sys/block
 
-export DEVPATH=/block/hda
-export DEVPATH=/block/sda/sda1
-#export DEVPATH=/block/sda
+SYSFSDIR=/sys		# change this for a nonstand sysfs mount point
+BIN=./udev		# location of your udev binary
+export ACTION=add	# 'add' or 'remove'
 
-
-./udev block
+for i in ${SYSFSDIR}/block/*; do
+	export DEVPATH="/"`echo $i | cut --delimiter='/' --fields=3-`
+	$BIN block
+done
diff --git a/test.tty b/test.tty
index 2d64f07d3e..ec8b1d0404 100644
--- a/test.tty
+++ b/test.tty
@@ -1,10 +1,12 @@
-#!/bin/sh
-export ACTION=add
-#export ACTION=remove
-export DEVPATH=/devices/pci0/00:09.0/usb1/1-1/1-1.1/ttyUSB7
-export DEVPATH=/class/tty/ttyUSB0
-#export DEVPATH=/block/hda
+#! /bin/sh
+#
+# test.tty - run udev(8) on each tty device in /sys/class/tty
 
+SYSFSDIR=/sys		# change this for a nonstand sysfs mount point
+BIN=./udev		# location of your udev binary
+export ACTION=add	# 'add' or 'remove'
 
-#./udev block
-./udev tty
+for i in ${SYSFSDIR}/class/tty/*; do
+	export DEVPATH="/"`echo $i | cut --delimiter='/' --fields=3-`
+	$BIN tty
+done