77 files changed, 86 insertions, 110 deletions
diff --git a/ctdb/tests/eventscripts/simple/10.interface.init.001.sh b/ctdb/tests/eventscripts/10.interface.init.001.sh
index 5a61ab3efdd..fae1a78d506 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.init.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.init.002.sh b/ctdb/tests/eventscripts/10.interface.init.002.sh
index 43bacd5231e..ba33f927c3f 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.init.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
index 411355f1052..42ef42d81b4 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.002.sh b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
index 43bacd5231e..ba33f927c3f 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.003.sh b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
index 5dd432816b2..1eb7916b932 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 interface down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.004.sh b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
index d215c400194..69ffbd00cd5 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.004.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up, 1 is a bond"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.005.sh b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
index 00db01fe63e..8cf7bbc9c0a 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.005.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, no active slaves"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.006.sh b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
index 862a9723730..3c483a3516f 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.006.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, active slaves, link down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.007.sh b/ctdb/tests/eventscripts/10.interface.monitor.007.sh
index 004247ef67f..c45900e3b2e 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.007.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.007.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "unknown interface, up"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.008.sh b/ctdb/tests/eventscripts/10.interface.monitor.008.sh
index aa59151c2a7..f73302b30da 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.008.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.008.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "unknown interface, down, up"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.009.sh b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
index ab890f34422..1b785ffdc80 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.009.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.010.sh b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
index 476d2c9f69b..4d233193fb6 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, all down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.011.sh b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
index 3e5ba34acec..21775d41ce5 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.012.sh b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
index d27c423e442..dbe84b77296 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.013.sh b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
index 88e884dc84d..0fcdcd8d15b 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.013.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 bond, active slaves, link down"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.014.sh b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
index 97cf253c3b7..ab23d307c29 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.014.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "spurious addresses on interface, no action"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.015.sh b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
index 6810733b541..ff54b69d9be 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.monitor.015.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "spurious addresses on interface, delete them"
 
diff --git a/ctdb/tests/eventscripts/multievent/10.interface.001.sh b/ctdb/tests/eventscripts/10.interface.multi.001.sh
index 5ef254c536f..da8dcf188df 100755
--- a/ctdb/tests/eventscripts/multievent/10.interface.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.multi.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, removeip"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.releaseip.001.sh b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
index cd38cff67ca..934b3dc30ec 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.releaseip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - no args given"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.releaseip.002.sh b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
index d08d27c7e00..9bcb7f11d67 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.releaseip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - remove a non-existent ip"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh b/ctdb/tests/eventscripts/10.interface.startup.001.sh
index 411355f1052..42ef42d81b4 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "no public addresses"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.startup.002.sh b/ctdb/tests/eventscripts/10.interface.startup.002.sh
index 43bacd5231e..ba33f927c3f 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.startup.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all interfaces up"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.takeip.001.sh b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
index cd38cff67ca..934b3dc30ec 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.takeip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - no args given"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.takeip.002.sh b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
index 9ee361a3266..8960b08997d 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.takeip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "add an ip"
 
diff --git a/ctdb/tests/eventscripts/simple/10.interface.takeip.003.sh b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
index ce78be90b02..203cff05be1 100755
--- a/ctdb/tests/eventscripts/simple/10.interface.takeip.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "error - add same IP twice"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.001.sh b/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
index 0bcf8e3055c..3d22864edfb 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.001.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not configured"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.002.sh b/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
index 9a32df09f1a..c54691fafc8 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.002.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "missing config, no takeip, ipreallocated"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.003.sh b/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
index 832101f91df..c1e0d01294d 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.003.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "empty config, ipreallocated"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.004.sh b/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
index 49d2b4efa1a..88ffac369cb 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.004.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "empty config, takeip"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.005.sh b/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
index 3ebacbedbb7..822f39f044d 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.005.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.006.sh b/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
index d4585563723..ed9df846fe7 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.006.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip, releaseip"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.007.sh b/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
index 53e9d3866ac..f7332ac50b9 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.007.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, ipreallocated"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.008.sh b/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
index 282ec073648..db37cbb2411 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.008.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip twice"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.009.sh b/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
index 771651e94a8..3e33e903c2b 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.009.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "All IPs configured, takeip"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.010.sh b/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
index f7caf1c98da..4704b9f04c7 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.010.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "All IPs configured, takeip all on node"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.011.sh b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
index 18b51d4b783..65adbb5d5a5 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.011.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "__auto_link_local__, takeip all on node"
 
diff --git a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.012.sh b/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
index c2720646d61..198551f877f 100755
--- a/ctdb/tests/eventscripts/multievent/13.per_ip_routing.012.sh
+++ b/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "1 IP configured, takeip, releaseip, ipreallocated"
 
diff --git a/ctdb/tests/eventscripts/simple/40.vsftpd.monitor.001.sh b/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
index 0f8b1a53c63..fdad12ae9a6 100755
--- a/ctdb/tests/eventscripts/simple/40.vsftpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/40.vsftpd.monitor.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 
diff --git a/ctdb/tests/eventscripts/simple/41.httpd.monitor.001.sh b/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
index 0a9ceac428e..f400eaa89b4 100755
--- a/ctdb/tests/eventscripts/simple/41.httpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh b/ctdb/tests/eventscripts/50.samba.monitor.001.sh
index 77fc2eb8523..ac3708f5fd4 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.001.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh b/ctdb/tests/eventscripts/50.samba.monitor.050.sh
index 7a1b422bd2f..f4b00bb8573 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.050.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.050.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "auto-start, simple"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh b/ctdb/tests/eventscripts/50.samba.monitor.051.sh
index 3a53ac8aaab..c9f1a96bc08 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.051.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.051.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "auto-stop, simple"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh b/ctdb/tests/eventscripts/50.samba.monitor.101.sh
index d4b80bbf8ff..cf3b53a8f17 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.101.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.101.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all OK"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh b/ctdb/tests/eventscripts/50.samba.monitor.102.sh
index 2f1f446fe8c..a2263f3c603 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.102.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.102.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "winbind down"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh b/ctdb/tests/eventscripts/50.samba.monitor.103.sh
index 8854780cade..6f71a96760a 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.103.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.103.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 445 down"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh b/ctdb/tests/eventscripts/50.samba.monitor.104.sh
index a29e7838b3a..9de022376be 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.104.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.104.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh b/ctdb/tests/eventscripts/50.samba.monitor.105.sh
index 624c4a502cd..9936eff8064 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.105.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.105.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "non-existent share path"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh b/ctdb/tests/eventscripts/50.samba.monitor.106.sh
index f54cc06c684..8fabfb33b6d 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.106.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.106.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "non-existent share - not checked"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.107.sh b/ctdb/tests/eventscripts/50.samba.monitor.107.sh
index e4151f37432..4c776ac8aa6 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.107.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.107.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, default tcp checker, debug"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.108.sh b/ctdb/tests/eventscripts/50.samba.monitor.108.sh
index d06a16f90a4..fcd5d279604 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.108.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.108.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport not implemented"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh b/ctdb/tests/eventscripts/50.samba.monitor.109.sh
index 4bc854b623e..f90ba629dbe 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.109.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.109.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport not implemented, debug"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh b/ctdb/tests/eventscripts/50.samba.monitor.110.sh
index 80264cc24e3..639cc515fe4 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.110.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.110.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport/nmap not implemented, debug"
 
diff --git a/ctdb/tests/eventscripts/simple/50.samba.monitor.111.sh b/ctdb/tests/eventscripts/50.samba.monitor.111.sh
index 4651290663a..c7f924cd7f8 100755
--- a/ctdb/tests/eventscripts/simple/50.samba.monitor.111.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.111.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "port 139 down, ctdb checktcpport/nmap/netstat not implemented"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.001.sh b/ctdb/tests/eventscripts/60.nfs.monitor.001.sh
index 5b260ac6fbd..c62e5cf8789 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "not managed, check no-op"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.100.sh b/ctdb/tests/eventscripts/60.nfs.monitor.100.sh
index 95f4dc6fb62..e846d827355 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.100.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.100.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "get RPC service fail limits/actions"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.101.sh b/ctdb/tests/eventscripts/60.nfs.monitor.101.sh
index 657db97a071..1a689278106 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.101.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.101.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "all services available"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.111.sh b/ctdb/tests/eventscripts/60.nfs.monitor.111.sh
index 8dcde029dd0..414fcc8066b 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.111.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.111.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "knfsd down, 1 iteration"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.112.sh b/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
index de796ebd07d..666a38aaaf6 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.112.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "knfsd down, 6 iterations"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.121.sh b/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
index 062c3f6f5c4..6d27f60b27a 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.121.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "lockd down, 15 iterations"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.122.sh b/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
index b93dba7b978..fc5cea87c75 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.122.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "lockd down, 15 iterations, back up after 10"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.131.sh b/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
index 84d20b761ce..1cf72a92844 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.131.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "rquotad down, 5 iterations"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.132.sh b/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
index fad9a4c5903..b8f3f2b0411 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.132.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "rquotad down, 5 iterations, back up after 1"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.141.sh b/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
index 377de6e229e..c77b1a7b052 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.141.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "statd down, 6 iterations"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.142.sh b/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
index 3ca3cf64a78..4373d8d6426 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.142.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "statd down, 8 iterations, back up after 2"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.151.sh b/ctdb/tests/eventscripts/60.nfs.monitor.151.sh
index af2dd26f5d2..ea9aa7830ec 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.151.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.151.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 1 iteration"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.152.sh b/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
index 9aad819b749..c4eb4194ae2 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.152.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 10 iterations"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.153.sh b/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
index 6b2750c82c8..cf33e39bbc8 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.153.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "mountd down, 10 iterations, back up after 5"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.161.sh b/ctdb/tests/eventscripts/60.nfs.monitor.161.sh
index 4abe68eaba7..1e07c181c2e 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.161.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.161.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "2nd share missing"
 
diff --git a/ctdb/tests/eventscripts/simple/60.nfs.monitor.162.sh b/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
index 865b1c635a6..ccd4ca84ea1 100755
--- a/ctdb/tests/eventscripts/simple/60.nfs.monitor.162.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "2nd share missing, skipping share checks"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.001.sh b/ctdb/tests/eventscripts/60.nfs.multi.001.sh
index a6608db83e2..e578c56c326 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.001.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, ipreallocated -> reconfigure"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.002.sh b/ctdb/tests/eventscripts/60.nfs.multi.002.sh
index 93f645a6185..0c203cdf257 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.002.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.002.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.003.sh b/ctdb/tests/eventscripts/60.nfs.multi.003.sh
index 929eaf2ae53..31867b27898 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.003.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.003.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay error"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.004.sh b/ctdb/tests/eventscripts/60.nfs.multi.004.sh
index addbf44c9c7..6220ad346ce 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.004.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.004.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay timedout"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.005.sh b/ctdb/tests/eventscripts/60.nfs.multi.005.sh
index 9e652013ca8..1a8200c9fc2 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.005.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.005.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "takeip, monitor -> reconfigure, replay disabled"
 
diff --git a/ctdb/tests/eventscripts/multievent/60.nfs.006.sh b/ctdb/tests/eventscripts/60.nfs.multi.006.sh
index 35f8b836e12..21beaadceaf 100755
--- a/ctdb/tests/eventscripts/multievent/60.nfs.006.sh
+++ b/ctdb/tests/eventscripts/60.nfs.multi.006.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${EVENTSCRIPTS_TESTS_DIR}/common.sh"
+. "${TEST_SCRIPTS_DIR}/unit.sh"
 
 define_test "reconfigure (synthetic), twice"
 # This checks that the lock is released...
diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 44c975e0340..cba552e92fd 100644
--- a/ctdb/tests/eventscripts/common.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -1,8 +1,5 @@
 # Hey Emacs, this is a -*- shell-script -*- !!!  :-)
 
-# Print a message and exit.
-die () { echo "$@" >&2 ; exit 1 ; }
-
 # Augment PATH with relevant stubs/ directories.  We do this by actually
 # setting PATH, and also by setting $EVENTSCRIPTS_PATH and then
 # prepending that to $PATH in rc.local to avoid the PATH reset in
@@ -10,45 +7,29 @@ die () { echo "$@" >&2 ; exit 1 ; }
 
 EVENTSCRIPTS_PATH=""
 
-if [ -d "${EVENTSCRIPTS_TESTS_DIR}/stubs" ] ; then
-    EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTS_DIR}/stubs"
-fi
-
-export EVENTSCRIPTS_TESTCASE_DIR=$(dirname "$0")
-if [ $(basename "$EVENTSCRIPTS_TESTCASE_DIR") = "eventscripts" ] ; then
-    # Just a test script, no testcase subdirectory.
-    EVENTSCRIPTS_TESTCASE_DIR="$EVENTSCRIPTS_TESTS_DIR"
-else
-    if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/stubs" ] ; then
-	EVENTSCRIPTS_PATH="${EVENTSCRIPTS_TESTCASE_DIR}/stubs:${EVENTSCRIPTS_PATH}"
-    fi
+if [ -d "${TEST_SUBDIR}/stubs" ] ; then
+    EVENTSCRIPTS_PATH="${TEST_SUBDIR}/stubs"
 fi
 
 export EVENTSCRIPTS_PATH
 
 PATH="${EVENTSCRIPTS_PATH}:${PATH}"
 
-if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc" ] ; then
-    CTDB_ETCDIR="${EVENTSCRIPTS_TESTCASE_DIR}/etc"
-elif [ -d "${EVENTSCRIPTS_TESTS_DIR}/etc" ] ; then
-    CTDB_ETCDIR="${EVENTSCRIPTS_TESTS_DIR}/etc"
+if [ -d "${TEST_SUBDIR}/etc" ] ; then
+    CTDB_ETCDIR="${TEST_SUBDIR}/etc"
 else
     die "Unable to set \$CTDB_ETCDIR"
 fi
 export CTDB_ETCDIR
 
-if [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc-ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTCASE_DIR}/etc-ctdb"
-elif [ -d "${EVENTSCRIPTS_TESTCASE_DIR}/etc/ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTCASE_DIR}/etc/ctdb"
-elif [ -d "${EVENTSCRIPTS_TESTS_DIR}/etc-ctdb" ] ; then
-    CTDB_BASE="${EVENTSCRIPTS_TESTS_DIR}/etc-ctdb"
+if [ -d "${TEST_SUBDIR}/etc-ctdb" ] ; then
+    CTDB_BASE="${TEST_SUBDIR}/etc-ctdb"
 else
     die "Unable to set \$CTDB_BASE"
 fi
 export CTDB_BASE
 
-export EVENTSCRIPTS_TESTS_VAR_DIR="${EVENTSCRIPTS_TESTS_DIR}/var"
+export EVENTSCRIPTS_TESTS_VAR_DIR="${TEST_SUBDIR}/var"
 if [ "$EVENTSCRIPTS_TESTS_VAR_DIR" != "/var" ] ; then
     rm -r "$EVENTSCRIPTS_TESTS_VAR_DIR"
 fi
@@ -57,7 +38,7 @@ export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb"
 
 ######################################################################
 
-if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] ; then
+if [ "$TEST_VERBOSE" = "yes" ] ; then
     debug () { echo "$@" ; }
 else
     debug () { : ; }
@@ -665,12 +646,7 @@ define_test ()
 {
     desc="$1"
 
-    _f="$0"
-    _f="${_f#./}"          # strip leading ./
-    _f="${_f#simple/}"     # strip leading simple/
-    _f="${_f#multievent/}" # strip leading multievent/
-    _f="${_f%%/*}"         # if subdir, strip off file
-    _f="${_f%.sh}"         # strip off .sh suffix if any
+    _f=$(basename "$0" ".sh")
 
     # Remaining format should be NN.service.event.NNN or NN.service.NNN:
     _num="${_f##*.}"
@@ -779,7 +755,7 @@ result_footer ()
 {
     _passed="$1"
 
-    if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] || ! $_passed ; then
+    if [ "$TEST_VERBOSE" = "yes" ] || ! $_passed ; then
 
 	cat <<EOF
 --------------------------------------------------
diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index 81d275af708..e43784e3bb9 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -126,7 +126,7 @@ ip_reallocate ()
 	    fi
 	    _flags="${_flags}${_flags:+,}${_this}"
 	done
-	"$(dirname ${EVENTSCRIPTS_TESTS_DIR})/bin/ctdb_takeover_tests" \
+	"$(dirname ${TEST_SUBDIR})/bin/ctdb_takeover_tests" \
 	    "ctdb_takeover_run_core" "$_flags" <"$FAKE_CTDB_IP_LAYOUT" |
 	    sort >"$_t"
 	mv "$_t" "$FAKE_CTDB_IP_LAYOUT"