ctdb-tests: Move eventscript tests to UNIT/ subdirectory

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

255 files changed, 1 insertions, 1 deletions

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.001.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.001.sh
index 807f3ef7352..807f3ef7352 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.001.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.002.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.002.sh
index 7ff5385676c..7ff5385676c 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.002.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.003.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.003.sh
index 2d1fb0d506c..2d1fb0d506c 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.003.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.004.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.004.sh
index 196d7c2af7c..196d7c2af7c 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.004.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.005.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.005.sh
index 3f85de474ba..3f85de474ba 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.005.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.005.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.006.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.006.sh
index 29794d71934..29794d71934 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.006.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.006.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.007.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.007.sh
index 5121513e248..5121513e248 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.007.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.007.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.008.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.008.sh
index 120aefc3805..120aefc3805 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.008.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.008.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.init.009.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.009.sh
index 92a0e254e60..92a0e254e60 100755
--- a/ctdb/tests/eventscripts/00.ctdb.init.009.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.init.009.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.001.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh
index 8ab1c305ced..8ab1c305ced 100755
--- a/ctdb/tests/eventscripts/00.ctdb.setup.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh
index 10bddea1549..10bddea1549 100755
--- a/ctdb/tests/eventscripts/00.ctdb.setup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh
index 7a82b254b24..7a82b254b24 100755
--- a/ctdb/tests/eventscripts/00.ctdb.setup.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh
diff --git a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh
index b10865ce884..b10865ce884 100755
--- a/ctdb/tests/eventscripts/00.ctdb.setup.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh
diff --git a/ctdb/tests/eventscripts/01.reclock.init.001.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.001.sh
index c495a47960e..c495a47960e 100755
--- a/ctdb/tests/eventscripts/01.reclock.init.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/01.reclock.init.001.sh
diff --git a/ctdb/tests/eventscripts/01.reclock.init.002.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.002.sh
index 1bd409ca96c..1bd409ca96c 100755
--- a/ctdb/tests/eventscripts/01.reclock.init.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/01.reclock.init.002.sh
diff --git a/ctdb/tests/eventscripts/01.reclock.init.003.sh b/ctdb/tests/UNIT/eventscripts/01.reclock.init.003.sh
index a8b6abdf5b5..a8b6abdf5b5 100755
--- a/ctdb/tests/eventscripts/01.reclock.init.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/01.reclock.init.003.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.001.sh
index 4171f3deb4d..4171f3deb4d 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.001.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.002.sh
index 4e78a56e896..4e78a56e896 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.003.sh
index 41fd914bb04..41fd914bb04 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.003.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.004.sh
index 34003937c75..34003937c75 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.004.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.005.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.005.sh
index 7e1a9531213..7e1a9531213 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.005.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.005.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.006.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.006.sh
index 48008d9386c..48008d9386c 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.006.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.006.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.007.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.007.sh
index 68b99cfb521..68b99cfb521 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.007.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.007.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.011.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.011.sh
index 6cd1dabbb37..6cd1dabbb37 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.011.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.012.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.012.sh
index 9e840564f49..9e840564f49 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.012.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.014.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.014.sh
index 9e2b21c9822..9e2b21c9822 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.014.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.015.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.015.sh
index 0091c429ac1..0091c429ac1 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.015.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.015.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.017.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.017.sh
index 8eef4afc85d..8eef4afc85d 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.017.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.017.sh
diff --git a/ctdb/tests/eventscripts/05.system.monitor.018.sh b/ctdb/tests/UNIT/eventscripts/05.system.monitor.018.sh
index cd9305f8826..cd9305f8826 100755
--- a/ctdb/tests/eventscripts/05.system.monitor.018.sh
+++ b/ctdb/tests/UNIT/eventscripts/05.system.monitor.018.sh
diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh
index fe5994e3f11..fe5994e3f11 100755
--- a/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.001.sh
diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh
index f46dd63761f..f46dd63761f 100755
--- a/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/06.nfs.releaseip.002.sh
diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh
index fe5994e3f11..fe5994e3f11 100755
--- a/ctdb/tests/eventscripts/06.nfs.takeip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.001.sh
diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh
index 4c6cfba9573..4c6cfba9573 100755
--- a/ctdb/tests/eventscripts/06.nfs.takeip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/06.nfs.takeip.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.010.sh b/ctdb/tests/UNIT/eventscripts/10.interface.010.sh
index 171a6973ea0..171a6973ea0 100755
--- a/ctdb/tests/eventscripts/10.interface.010.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.010.sh
diff --git a/ctdb/tests/eventscripts/10.interface.011.sh b/ctdb/tests/UNIT/eventscripts/10.interface.011.sh
index 7f4302db8dd..7f4302db8dd 100755
--- a/ctdb/tests/eventscripts/10.interface.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.011.sh
diff --git a/ctdb/tests/eventscripts/10.interface.012.sh b/ctdb/tests/UNIT/eventscripts/10.interface.012.sh
index 2ef0fe61a4e..2ef0fe61a4e 100755
--- a/ctdb/tests/eventscripts/10.interface.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.012.sh
diff --git a/ctdb/tests/eventscripts/10.interface.013.sh b/ctdb/tests/UNIT/eventscripts/10.interface.013.sh
index e9a4c304c75..e9a4c304c75 100755
--- a/ctdb/tests/eventscripts/10.interface.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.013.sh
diff --git a/ctdb/tests/eventscripts/10.interface.init.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.001.sh
index 7f370b2d3db..7f370b2d3db 100755
--- a/ctdb/tests/eventscripts/10.interface.init.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.init.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.init.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.002.sh
index 1862eac49d0..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.init.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.init.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.init.021.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.021.sh
index fd89c87670f..fd89c87670f 100755
--- a/ctdb/tests/eventscripts/10.interface.init.021.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.init.021.sh
diff --git a/ctdb/tests/eventscripts/10.interface.init.022.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.022.sh
index ee7fa148ff4..ee7fa148ff4 100755
--- a/ctdb/tests/eventscripts/10.interface.init.022.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.init.022.sh
diff --git a/ctdb/tests/eventscripts/10.interface.init.023.sh b/ctdb/tests/UNIT/eventscripts/10.interface.init.023.sh
index b39b67aead9..b39b67aead9 100755
--- a/ctdb/tests/eventscripts/10.interface.init.023.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.init.023.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.001.sh
index c829efc87ee..c829efc87ee 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.002.sh
index 1862eac49d0..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.003.sh
index db1b2c64284..db1b2c64284 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.003.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.004.sh
index 3f20fdc6b8e..3f20fdc6b8e 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.004.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.005.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.005.sh
index 1042d1566de..1042d1566de 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.005.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.005.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.006.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.006.sh
index 5facf0850ec..5facf0850ec 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.006.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.006.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.009.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.009.sh
index 93ed68baf4c..93ed68baf4c 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.009.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.009.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.010.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.010.sh
index 528789372e6..528789372e6 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.010.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.010.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.011.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.011.sh
index 824bd32b062..824bd32b062 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.011.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.012.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.012.sh
index 131598030d5..131598030d5 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.012.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.013.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.013.sh
index 2aa0a8e21b6..2aa0a8e21b6 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.013.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.014.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.014.sh
index 1dd8ff0976a..1dd8ff0976a 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.014.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.015.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.015.sh
index b7b4787eb1b..b7b4787eb1b 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.015.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.015.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.016.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.016.sh
index bd7f3022ca4..bd7f3022ca4 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.016.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.016.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.017.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.017.sh
index bae0886b51d..bae0886b51d 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.017.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.017.sh
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.018.sh b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.018.sh
index 8006d92c4fc..8006d92c4fc 100755
--- a/ctdb/tests/eventscripts/10.interface.monitor.018.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.monitor.018.sh
diff --git a/ctdb/tests/eventscripts/10.interface.multi.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.multi.001.sh
index 867cc2443db..867cc2443db 100755
--- a/ctdb/tests/eventscripts/10.interface.multi.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.multi.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.001.sh
index 2ac0b86f5ed..2ac0b86f5ed 100755
--- a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.002.sh
index a60adbdbd7a..a60adbdbd7a 100755
--- a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.releaseip.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.startup.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.startup.001.sh
index c829efc87ee..c829efc87ee 100755
--- a/ctdb/tests/eventscripts/10.interface.startup.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.startup.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.startup.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.startup.002.sh
index 1862eac49d0..1862eac49d0 100755
--- a/ctdb/tests/eventscripts/10.interface.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.startup.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.001.sh
index 2ac0b86f5ed..2ac0b86f5ed 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.001.sh
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.002.sh
index e267f16739c..e267f16739c 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.002.sh
diff --git a/ctdb/tests/eventscripts/10.interface.takeip.003.sh b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.003.sh
index acb9b045f70..acb9b045f70 100755
--- a/ctdb/tests/eventscripts/10.interface.takeip.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/10.interface.takeip.003.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.001.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.001.sh
index 06b2cd39cee..06b2cd39cee 100755
--- a/ctdb/tests/eventscripts/11.natgw.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.001.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.002.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.002.sh
index 5e3f2d3a224..5e3f2d3a224 100755
--- a/ctdb/tests/eventscripts/11.natgw.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.002.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.003.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.003.sh
index 46237e5f314..46237e5f314 100755
--- a/ctdb/tests/eventscripts/11.natgw.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.003.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.004.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.004.sh
index e441c4c5965..e441c4c5965 100755
--- a/ctdb/tests/eventscripts/11.natgw.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.004.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.011.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.011.sh
index e8513c9f2e3..e8513c9f2e3 100755
--- a/ctdb/tests/eventscripts/11.natgw.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.011.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.012.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.012.sh
index 94cbe9d22b9..94cbe9d22b9 100755
--- a/ctdb/tests/eventscripts/11.natgw.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.012.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.013.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.013.sh
index 0a15862d75a..0a15862d75a 100755
--- a/ctdb/tests/eventscripts/11.natgw.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.013.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.014.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.014.sh
index f3a586a9a66..f3a586a9a66 100755
--- a/ctdb/tests/eventscripts/11.natgw.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.014.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.015.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.015.sh
index dbe09d2efd1..dbe09d2efd1 100755
--- a/ctdb/tests/eventscripts/11.natgw.015.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.015.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.021.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.021.sh
index 41bb185bccf..41bb185bccf 100755
--- a/ctdb/tests/eventscripts/11.natgw.021.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.021.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.022.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.022.sh
index 4c2c11b5bad..4c2c11b5bad 100755
--- a/ctdb/tests/eventscripts/11.natgw.022.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.022.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.023.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.023.sh
index c487aaaeb53..c487aaaeb53 100755
--- a/ctdb/tests/eventscripts/11.natgw.023.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.023.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.024.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.024.sh
index a13879cb30e..a13879cb30e 100755
--- a/ctdb/tests/eventscripts/11.natgw.024.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.024.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.025.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.025.sh
index a1b049f2e39..a1b049f2e39 100755
--- a/ctdb/tests/eventscripts/11.natgw.025.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.025.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.031.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.031.sh
index 0cff321764e..0cff321764e 100755
--- a/ctdb/tests/eventscripts/11.natgw.031.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.031.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.041.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.041.sh
index 05eeb6ae4b0..05eeb6ae4b0 100755
--- a/ctdb/tests/eventscripts/11.natgw.041.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.041.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.042.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.042.sh
index 39709c29c16..39709c29c16 100755
--- a/ctdb/tests/eventscripts/11.natgw.042.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.042.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.051.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.051.sh
index 9bf8569607c..9bf8569607c 100755
--- a/ctdb/tests/eventscripts/11.natgw.051.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.051.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.052.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.052.sh
index 2d4a339cb98..2d4a339cb98 100755
--- a/ctdb/tests/eventscripts/11.natgw.052.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.052.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.053.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.053.sh
index d9b173e8d22..d9b173e8d22 100755
--- a/ctdb/tests/eventscripts/11.natgw.053.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.053.sh
diff --git a/ctdb/tests/eventscripts/11.natgw.054.sh b/ctdb/tests/UNIT/eventscripts/11.natgw.054.sh
index a2173f38fd3..a2173f38fd3 100755
--- a/ctdb/tests/eventscripts/11.natgw.054.sh
+++ b/ctdb/tests/UNIT/eventscripts/11.natgw.054.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.001.sh
index 55c8c64f577..55c8c64f577 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.001.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.002.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.002.sh
index 6925983bafa..6925983bafa 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.002.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.003.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.003.sh
index 4eac9635ce6..4eac9635ce6 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.003.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.004.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.004.sh
index 3724de04cbe..3724de04cbe 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.004.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.005.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.005.sh
index baafbbb8141..baafbbb8141 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.005.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.005.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.006.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.006.sh
index 6c4d6862d58..6c4d6862d58 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.006.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.006.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.007.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.007.sh
index 4cf46e6e543..4cf46e6e543 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.007.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.007.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.008.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.008.sh
index 889b4c4a7b6..889b4c4a7b6 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.008.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.008.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.009.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.009.sh
index c887febab3c..c887febab3c 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.009.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.009.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.010.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.010.sh
index 7297f96402f..7297f96402f 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.010.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.010.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.011.sh
index 8d96c8df658..8d96c8df658 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.011.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.012.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.012.sh
index 48aab217d63..48aab217d63 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.012.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.013.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.013.sh
index 226208323b0..226208323b0 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.013.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.014.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.014.sh
index a63e134958b..a63e134958b 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.014.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.015.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh
index 742cfd436d7..742cfd436d7 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.015.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.015.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.016.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.016.sh
index 4856ba55c53..4856ba55c53 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.016.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.016.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.017.sh
index d26ab9c0c71..d26ab9c0c71 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.017.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.017.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.018.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.018.sh
index 4d89dc22e26..4d89dc22e26 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.018.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.018.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.019.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.019.sh
index 757546632f6..757546632f6 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.019.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.019.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.021.sh
index 876b600cb21..876b600cb21 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.021.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.021.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.022.sh
index 6f0638eaf8e..6f0638eaf8e 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.022.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.022.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.023.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.023.sh
index a94b58bcee0..a94b58bcee0 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.023.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.023.sh
diff --git a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh
index 7b1af3705aa..7b1af3705aa 100755
--- a/ctdb/tests/eventscripts/13.per_ip_routing.024.sh
+++ b/ctdb/tests/UNIT/eventscripts/13.per_ip_routing.024.sh
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.001.sh
index 49917654c87..49917654c87 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.001.sh
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.002.sh
index f57f47604cd..f57f47604cd 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.003.sh
index 0d768a0139e..0d768a0139e 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.003.sh
diff --git a/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.004.sh
index a655b83ebfb..a655b83ebfb 100755
--- a/ctdb/tests/eventscripts/20.multipathd.monitor.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/20.multipathd.monitor.004.sh
diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.002.sh
index 48d3cbf1891..48d3cbf1891 100755
--- a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.003.sh
index f4e37d2b7b5..f4e37d2b7b5 100755
--- a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/31.clamd.monitor.003.sh
diff --git a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh
index 4426e1b103c..4426e1b103c 100755
--- a/ctdb/tests/eventscripts/40.vsftpd.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/40.vsftpd.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.shutdown.002.sh
index fe6527817db..fe6527817db 100755
--- a/ctdb/tests/eventscripts/40.vsftpd.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/40.vsftpd.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh b/ctdb/tests/UNIT/eventscripts/40.vsftpd.startup.002.sh
index dd39860b7b4..dd39860b7b4 100755
--- a/ctdb/tests/eventscripts/40.vsftpd.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/40.vsftpd.startup.002.sh
diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.monitor.002.sh
index 383040c4158..383040c4158 100755
--- a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/41.httpd.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.shutdown.002.sh
index 4e342fbfaed..4e342fbfaed 100755
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/41.httpd.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/UNIT/eventscripts/41.httpd.startup.002.sh
index 1722785450a..1722785450a 100755
--- a/ctdb/tests/eventscripts/41.httpd.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/41.httpd.startup.002.sh
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.101.sh
index 3884a33a986..3884a33a986 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.101.sh
+++ b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.101.sh
diff --git a/ctdb/tests/eventscripts/49.winbind.monitor.102.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.102.sh
index 24e4ed251c7..24e4ed251c7 100755
--- a/ctdb/tests/eventscripts/49.winbind.monitor.102.sh
+++ b/ctdb/tests/UNIT/eventscripts/49.winbind.monitor.102.sh
diff --git a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.shutdown.002.sh
index dc6f160e38b..dc6f160e38b 100755
--- a/ctdb/tests/eventscripts/49.winbind.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/49.winbind.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/49.winbind.startup.002.sh b/ctdb/tests/UNIT/eventscripts/49.winbind.startup.002.sh
index dd0c1adc703..dd0c1adc703 100755
--- a/ctdb/tests/eventscripts/49.winbind.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/49.winbind.startup.002.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.101.sh
index 3884a33a986..3884a33a986 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.101.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.101.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.103.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.103.sh
index e9232a65117..e9232a65117 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.103.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.103.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.104.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.104.sh
index 8e9d7896d57..8e9d7896d57 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.104.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.104.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh
index 1f2fa1e9068..1f2fa1e9068 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.105.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.105.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.106.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.106.sh
index 80bccef1e77..80bccef1e77 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.106.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.106.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.110.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.110.sh
index 9645c5a4d79..9645c5a4d79 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.110.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.110.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.111.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.111.sh
index 55df6da807e..55df6da807e 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.111.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.111.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh
index f71447206f2..f71447206f2 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.112.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.112.sh
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh
index faadda1a0b1..faadda1a0b1 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.113.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.monitor.113.sh
diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.001.sh
index 76ac985ff7e..76ac985ff7e 100755
--- a/ctdb/tests/eventscripts/50.samba.shutdown.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.001.sh
diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.002.sh
index f6920267fe0..f6920267fe0 100755
--- a/ctdb/tests/eventscripts/50.samba.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/50.samba.shutdown.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh
index a64696bf723..a64696bf723 100755
--- a/ctdb/tests/eventscripts/50.samba.shutdown.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.shutdown.011.sh
diff --git a/ctdb/tests/eventscripts/50.samba.startup.011.sh b/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh
index ce79767fb36..ce79767fb36 100755
--- a/ctdb/tests/eventscripts/50.samba.startup.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/50.samba.startup.011.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.101.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.101.sh
index 293b724001e..293b724001e 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.101.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.101.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.102.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.102.sh
index 2f83b2ce976..2f83b2ce976 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.102.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.102.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.103.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.103.sh
index c0bb305875a..c0bb305875a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.103.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.103.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.104.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.104.sh
index d5688925629..d5688925629 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.104.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.104.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.105.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh
index e83ead84e33..e83ead84e33 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.105.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.105.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.106.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh
index 43d6b2f03ec..43d6b2f03ec 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.106.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.106.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.107.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.107.sh
index 8bf0fa29e7a..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.107.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.107.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.108.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.108.sh
index eb139edbad8..eb139edbad8 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.108.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.108.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.109.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.109.sh
index d0cf43c3b65..d0cf43c3b65 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.109.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.109.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.111.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh
index 2bbda9686b7..2bbda9686b7 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.111.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.111.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.112.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh
index 4000b5d8435..4000b5d8435 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.112.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.112.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh
index 744966c94c7..744966c94c7 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.113.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh
index 7170fff6472..7170fff6472 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.114.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.121.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh
index 1cda2765c38..1cda2765c38 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.121.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.121.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.122.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh
index eae7ca0b42a..eae7ca0b42a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.122.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.122.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.131.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh
index 33e1cf47499..33e1cf47499 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.131.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.131.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.132.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh
index 207d872c24f..207d872c24f 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.132.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.132.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.141.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh
index 5a8c5ce75a7..5a8c5ce75a7 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.141.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.141.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.142.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh
index 694bf928b7e..694bf928b7e 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.142.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.142.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh
index d17277ea88d..d17277ea88d 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.143.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.144.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh
index 5a8c5ce75a7..5a8c5ce75a7 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.144.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.144.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.151.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh
index 9ab18072d4f..9ab18072d4f 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.151.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.151.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.152.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh
index c3a6b8bbf30..c3a6b8bbf30 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.152.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.152.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.153.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh
index a09315bcac5..a09315bcac5 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.153.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.153.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.161.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh
index ed080c2c4c8..ed080c2c4c8 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.161.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.161.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.162.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.162.sh
index 9e3438f2e9a..9e3438f2e9a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.monitor.162.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.multi.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.001.sh
index baa57019e32..baa57019e32 100755
--- a/ctdb/tests/eventscripts/60.nfs.multi.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.001.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.multi.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.002.sh
index 846380f92b1..846380f92b1 100755
--- a/ctdb/tests/eventscripts/60.nfs.multi.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.multi.002.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.001.sh
index 8bf0fa29e7a..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.001.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.002.sh
index 7f0d6b115ec..7f0d6b115ec 100755
--- a/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.releaseip.002.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.001.sh
index 8bf0fa29e7a..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.001.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.002.sh
index 11312d6d1ab..11312d6d1ab 100755
--- a/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.startup.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.001.sh
index 8bf0fa29e7a..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.startup.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.001.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.startup.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.002.sh
index ccea98e4bd7..ccea98e4bd7 100755
--- a/ctdb/tests/eventscripts/60.nfs.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.startup.002.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.001.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.001.sh
index 8bf0fa29e7a..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.takeip.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.001.sh
diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.002.sh b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.002.sh
index 4d887b77cbb..4d887b77cbb 100755
--- a/ctdb/tests/eventscripts/60.nfs.takeip.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/60.nfs.takeip.002.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.001.sh
index 9fc8d029770..9fc8d029770 100755
--- a/ctdb/tests/eventscripts/91.lvs.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.001.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.011.sh
index 68660475b5a..68660475b5a 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.011.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.011.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh
index 970a4aa9ccf..970a4aa9ccf 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.012.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.012.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh
index 0720036b448..0720036b448 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.013.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.013.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh
index 19788d7bc8c..19788d7bc8c 100755
--- a/ctdb/tests/eventscripts/91.lvs.ipreallocated.014.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.ipreallocated.014.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.001.sh
index 42831fb16f3..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.001.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.002.sh
index a8080178d8d..a8080178d8d 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.002.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.monitor.003.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.003.sh
index 89f443e39c2..89f443e39c2 100755
--- a/ctdb/tests/eventscripts/91.lvs.monitor.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.monitor.003.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.001.sh
index 42831fb16f3..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.shutdown.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.001.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.002.sh
index 61c7f96d48b..61c7f96d48b 100755
--- a/ctdb/tests/eventscripts/91.lvs.shutdown.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.002.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.startup.001.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.001.sh
index 42831fb16f3..42831fb16f3 100755
--- a/ctdb/tests/eventscripts/91.lvs.startup.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.001.sh
diff --git a/ctdb/tests/eventscripts/91.lvs.startup.002.sh b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.002.sh
index e4c5e8d23cb..e4c5e8d23cb 100755
--- a/ctdb/tests/eventscripts/91.lvs.startup.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/91.lvs.startup.002.sh
diff --git a/ctdb/tests/eventscripts/README b/ctdb/tests/UNIT/eventscripts/README
index 304cdba185a..304cdba185a 100644
--- a/ctdb/tests/eventscripts/README
+++ b/ctdb/tests/UNIT/eventscripts/README
diff --git a/ctdb/tests/eventscripts/etc-ctdb/public_addresses b/ctdb/tests/UNIT/eventscripts/etc-ctdb/public_addresses
index cd2f6be4e1e..cd2f6be4e1e 100644
--- a/ctdb/tests/eventscripts/etc-ctdb/public_addresses
+++ b/ctdb/tests/UNIT/eventscripts/etc-ctdb/public_addresses
diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/UNIT/eventscripts/etc-ctdb/rc.local
index 72a79bc66ac..72a79bc66ac 100755
--- a/ctdb/tests/eventscripts/etc-ctdb/rc.local
+++ b/ctdb/tests/UNIT/eventscripts/etc-ctdb/rc.local
diff --git a/ctdb/tests/eventscripts/etc/init.d/nfs b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfs
index 43eb308e340..43eb308e340 100755
--- a/ctdb/tests/eventscripts/etc/init.d/nfs
+++ b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfs
diff --git a/ctdb/tests/eventscripts/etc/init.d/nfslock b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfslock
index 43eb308e340..43eb308e340 100755
--- a/ctdb/tests/eventscripts/etc/init.d/nfslock
+++ b/ctdb/tests/UNIT/eventscripts/etc/init.d/nfslock
diff --git a/ctdb/tests/eventscripts/etc/samba/smb.conf b/ctdb/tests/UNIT/eventscripts/etc/samba/smb.conf
index da89db2b81f..da89db2b81f 100644
--- a/ctdb/tests/eventscripts/etc/samba/smb.conf
+++ b/ctdb/tests/UNIT/eventscripts/etc/samba/smb.conf
diff --git a/ctdb/tests/eventscripts/etc/sysconfig/nfs b/ctdb/tests/UNIT/eventscripts/etc/sysconfig/nfs
index 090d786ea68..090d786ea68 100644
--- a/ctdb/tests/eventscripts/etc/sysconfig/nfs
+++ b/ctdb/tests/UNIT/eventscripts/etc/sysconfig/nfs
diff --git a/ctdb/tests/eventscripts/scripts/00.ctdb.sh b/ctdb/tests/UNIT/eventscripts/scripts/00.ctdb.sh
index 7925679cc47..7925679cc47 100644
--- a/ctdb/tests/eventscripts/scripts/00.ctdb.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/00.ctdb.sh
diff --git a/ctdb/tests/eventscripts/scripts/01.reclock.sh b/ctdb/tests/UNIT/eventscripts/scripts/01.reclock.sh
index cc1f086bb2c..cc1f086bb2c 100644
--- a/ctdb/tests/eventscripts/scripts/01.reclock.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/01.reclock.sh
diff --git a/ctdb/tests/eventscripts/scripts/05.system.sh b/ctdb/tests/UNIT/eventscripts/scripts/05.system.sh
index eaf3e989b9f..eaf3e989b9f 100644
--- a/ctdb/tests/eventscripts/scripts/05.system.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/05.system.sh
diff --git a/ctdb/tests/eventscripts/scripts/06.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh
index 48ee4895cf0..48ee4895cf0 100644
--- a/ctdb/tests/eventscripts/scripts/06.nfs.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/06.nfs.sh
diff --git a/ctdb/tests/eventscripts/scripts/10.interface.sh b/ctdb/tests/UNIT/eventscripts/scripts/10.interface.sh
index b2bc87ed558..b2bc87ed558 100644
--- a/ctdb/tests/eventscripts/scripts/10.interface.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/10.interface.sh
diff --git a/ctdb/tests/eventscripts/scripts/11.natgw.sh b/ctdb/tests/UNIT/eventscripts/scripts/11.natgw.sh
index 75b2771899c..75b2771899c 100644
--- a/ctdb/tests/eventscripts/scripts/11.natgw.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/11.natgw.sh
diff --git a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh b/ctdb/tests/UNIT/eventscripts/scripts/13.per_ip_routing.sh
index e57e91a50c2..e57e91a50c2 100644
--- a/ctdb/tests/eventscripts/scripts/13.per_ip_routing.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/13.per_ip_routing.sh
diff --git a/ctdb/tests/eventscripts/scripts/20.multipathd.sh b/ctdb/tests/UNIT/eventscripts/scripts/20.multipathd.sh
index 2a69ae868b4..2a69ae868b4 100644
--- a/ctdb/tests/eventscripts/scripts/20.multipathd.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/20.multipathd.sh
diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/UNIT/eventscripts/scripts/31.clamd.sh
index 8fe3bbc6186..8fe3bbc6186 100644
--- a/ctdb/tests/eventscripts/scripts/31.clamd.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/31.clamd.sh
diff --git a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh b/ctdb/tests/UNIT/eventscripts/scripts/40.vsftpd.sh
index de2aa263c21..de2aa263c21 100644
--- a/ctdb/tests/eventscripts/scripts/40.vsftpd.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/40.vsftpd.sh
diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/UNIT/eventscripts/scripts/41.httpd.sh
index 9b4a9ad6342..9b4a9ad6342 100644
--- a/ctdb/tests/eventscripts/scripts/41.httpd.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/41.httpd.sh
diff --git a/ctdb/tests/eventscripts/scripts/49.winbind.sh b/ctdb/tests/UNIT/eventscripts/scripts/49.winbind.sh
index e9bbe31faf5..e9bbe31faf5 100644
--- a/ctdb/tests/eventscripts/scripts/49.winbind.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/49.winbind.sh
diff --git a/ctdb/tests/eventscripts/scripts/50.samba.sh b/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
index 3ffe18a201e..3ffe18a201e 100644
--- a/ctdb/tests/eventscripts/scripts/50.samba.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
index 59cdeda9b96..59cdeda9b96 100644
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
diff --git a/ctdb/tests/eventscripts/scripts/91.lvs.sh b/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
index a29c4d353fd..a29c4d353fd 100644
--- a/ctdb/tests/eventscripts/scripts/91.lvs.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
index e1b92b41fbe..e1b92b41fbe 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/local.sh
diff --git a/ctdb/tests/eventscripts/scripts/statd-callout.sh b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
index 88dc9acdf78..88dc9acdf78 100644
--- a/ctdb/tests/eventscripts/scripts/statd-callout.sh
+++ b/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.001.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.001.sh
index 72933905bbd..72933905bbd 100755
--- a/ctdb/tests/eventscripts/statd-callout.001.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.001.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.002.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.002.sh
index ce9f139e9be..ce9f139e9be 100755
--- a/ctdb/tests/eventscripts/statd-callout.002.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.002.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.003.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.003.sh
index 25bec29824b..25bec29824b 100755
--- a/ctdb/tests/eventscripts/statd-callout.003.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.003.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.004.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.004.sh
index dc2156b460c..dc2156b460c 100755
--- a/ctdb/tests/eventscripts/statd-callout.004.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.004.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.005.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.005.sh
index 1f802a2e8c3..1f802a2e8c3 100755
--- a/ctdb/tests/eventscripts/statd-callout.005.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.005.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.006.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.006.sh
index 8ecba5ceeed..8ecba5ceeed 100755
--- a/ctdb/tests/eventscripts/statd-callout.006.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.006.sh
diff --git a/ctdb/tests/eventscripts/statd-callout.007.sh b/ctdb/tests/UNIT/eventscripts/statd-callout.007.sh
index 4445fff274a..4445fff274a 100755
--- a/ctdb/tests/eventscripts/statd-callout.007.sh
+++ b/ctdb/tests/UNIT/eventscripts/statd-callout.007.sh
diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/UNIT/eventscripts/stubs/ctdb
index 12627de16a5..12627de16a5 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb
diff --git a/ctdb/tests/eventscripts/stubs/ctdb-config b/ctdb/tests/UNIT/eventscripts/stubs/ctdb-config
index 818e3db6931..818e3db6931 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb-config
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb-config
diff --git a/ctdb/tests/eventscripts/stubs/ctdb_killtcp b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_killtcp
index cb5b6e57374..cb5b6e57374 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb_killtcp
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_killtcp
diff --git a/ctdb/tests/eventscripts/stubs/ctdb_lvs b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs
index 5dfb24901e3..5dfb24901e3 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb_lvs
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_lvs
diff --git a/ctdb/tests/eventscripts/stubs/ctdb_natgw b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_natgw
index 96ba7ef8bbf..96ba7ef8bbf 100755
--- a/ctdb/tests/eventscripts/stubs/ctdb_natgw
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ctdb_natgw
diff --git a/ctdb/tests/eventscripts/stubs/date b/ctdb/tests/UNIT/eventscripts/stubs/date
index 2f470a8156f..2f470a8156f 100755
--- a/ctdb/tests/eventscripts/stubs/date
+++ b/ctdb/tests/UNIT/eventscripts/stubs/date
diff --git a/ctdb/tests/eventscripts/stubs/df b/ctdb/tests/UNIT/eventscripts/stubs/df
index a2e7093293d..a2e7093293d 100755
--- a/ctdb/tests/eventscripts/stubs/df
+++ b/ctdb/tests/UNIT/eventscripts/stubs/df
diff --git a/ctdb/tests/eventscripts/stubs/ethtool b/ctdb/tests/UNIT/eventscripts/stubs/ethtool
index bd173f438f7..bd173f438f7 100755
--- a/ctdb/tests/eventscripts/stubs/ethtool
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ethtool
diff --git a/ctdb/tests/eventscripts/stubs/exportfs b/ctdb/tests/UNIT/eventscripts/stubs/exportfs
index 46c65225be1..46c65225be1 100755
--- a/ctdb/tests/eventscripts/stubs/exportfs
+++ b/ctdb/tests/UNIT/eventscripts/stubs/exportfs
diff --git a/ctdb/tests/eventscripts/stubs/id b/ctdb/tests/UNIT/eventscripts/stubs/id
index 1ecd2f80bf7..1ecd2f80bf7 100755
--- a/ctdb/tests/eventscripts/stubs/id
+++ b/ctdb/tests/UNIT/eventscripts/stubs/id
diff --git a/ctdb/tests/eventscripts/stubs/ip b/ctdb/tests/UNIT/eventscripts/stubs/ip
index 630d0e8b433..630d0e8b433 100755
--- a/ctdb/tests/eventscripts/stubs/ip
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ip
diff --git a/ctdb/tests/eventscripts/stubs/ip6tables b/ctdb/tests/UNIT/eventscripts/stubs/ip6tables
index 2c65f7ba112..2c65f7ba112 100755
--- a/ctdb/tests/eventscripts/stubs/ip6tables
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ip6tables
diff --git a/ctdb/tests/eventscripts/stubs/iptables b/ctdb/tests/UNIT/eventscripts/stubs/iptables
index 2c65f7ba112..2c65f7ba112 100755
--- a/ctdb/tests/eventscripts/stubs/iptables
+++ b/ctdb/tests/UNIT/eventscripts/stubs/iptables
diff --git a/ctdb/tests/eventscripts/stubs/ipvsadm b/ctdb/tests/UNIT/eventscripts/stubs/ipvsadm
index 0567f881e54..0567f881e54 100755
--- a/ctdb/tests/eventscripts/stubs/ipvsadm
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ipvsadm
diff --git a/ctdb/tests/eventscripts/stubs/kill b/ctdb/tests/UNIT/eventscripts/stubs/kill
index b69e3e62a39..b69e3e62a39 100755
--- a/ctdb/tests/eventscripts/stubs/kill
+++ b/ctdb/tests/UNIT/eventscripts/stubs/kill
diff --git a/ctdb/tests/eventscripts/stubs/killall b/ctdb/tests/UNIT/eventscripts/stubs/killall
index 1e182e1e0d7..1e182e1e0d7 100755
--- a/ctdb/tests/eventscripts/stubs/killall
+++ b/ctdb/tests/UNIT/eventscripts/stubs/killall
diff --git a/ctdb/tests/eventscripts/stubs/multipath b/ctdb/tests/UNIT/eventscripts/stubs/multipath
index 64f95e7efb5..64f95e7efb5 100755
--- a/ctdb/tests/eventscripts/stubs/multipath
+++ b/ctdb/tests/UNIT/eventscripts/stubs/multipath
diff --git a/ctdb/tests/eventscripts/stubs/net b/ctdb/tests/UNIT/eventscripts/stubs/net
index 3f964133134..3f964133134 100755
--- a/ctdb/tests/eventscripts/stubs/net
+++ b/ctdb/tests/UNIT/eventscripts/stubs/net
diff --git a/ctdb/tests/eventscripts/stubs/pidof b/ctdb/tests/UNIT/eventscripts/stubs/pidof
index 8b57923d0ba..8b57923d0ba 100755
--- a/ctdb/tests/eventscripts/stubs/pidof
+++ b/ctdb/tests/UNIT/eventscripts/stubs/pidof
diff --git a/ctdb/tests/eventscripts/stubs/pkill b/ctdb/tests/UNIT/eventscripts/stubs/pkill
index b3f1de5a570..b3f1de5a570 100755
--- a/ctdb/tests/eventscripts/stubs/pkill
+++ b/ctdb/tests/UNIT/eventscripts/stubs/pkill
diff --git a/ctdb/tests/eventscripts/stubs/ps b/ctdb/tests/UNIT/eventscripts/stubs/ps
index f8e0ae0ba8a..f8e0ae0ba8a 100755
--- a/ctdb/tests/eventscripts/stubs/ps
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ps
diff --git a/ctdb/tests/eventscripts/stubs/rm b/ctdb/tests/UNIT/eventscripts/stubs/rm
index 64b4d186b65..64b4d186b65 100755
--- a/ctdb/tests/eventscripts/stubs/rm
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rm
diff --git a/ctdb/tests/eventscripts/stubs/rpc.lockd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.lockd
index e71f6cd8ff0..e71f6cd8ff0 100755
--- a/ctdb/tests/eventscripts/stubs/rpc.lockd
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rpc.lockd
diff --git a/ctdb/tests/eventscripts/stubs/rpc.mountd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.mountd
index e71f6cd8ff0..e71f6cd8ff0 100755
--- a/ctdb/tests/eventscripts/stubs/rpc.mountd
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rpc.mountd
diff --git a/ctdb/tests/eventscripts/stubs/rpc.rquotad b/ctdb/tests/UNIT/eventscripts/stubs/rpc.rquotad
index e71f6cd8ff0..e71f6cd8ff0 100755
--- a/ctdb/tests/eventscripts/stubs/rpc.rquotad
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rpc.rquotad
diff --git a/ctdb/tests/eventscripts/stubs/rpc.statd b/ctdb/tests/UNIT/eventscripts/stubs/rpc.statd
index e71f6cd8ff0..e71f6cd8ff0 100755
--- a/ctdb/tests/eventscripts/stubs/rpc.statd
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rpc.statd
diff --git a/ctdb/tests/eventscripts/stubs/rpcinfo b/ctdb/tests/UNIT/eventscripts/stubs/rpcinfo
index dd6de3b1826..dd6de3b1826 100755
--- a/ctdb/tests/eventscripts/stubs/rpcinfo
+++ b/ctdb/tests/UNIT/eventscripts/stubs/rpcinfo
diff --git a/ctdb/tests/eventscripts/stubs/service b/ctdb/tests/UNIT/eventscripts/stubs/service
index 3d6ddf4ba68..3d6ddf4ba68 100755
--- a/ctdb/tests/eventscripts/stubs/service
+++ b/ctdb/tests/UNIT/eventscripts/stubs/service
diff --git a/ctdb/tests/eventscripts/stubs/sleep b/ctdb/tests/UNIT/eventscripts/stubs/sleep
index e4542444de7..e4542444de7 100755
--- a/ctdb/tests/eventscripts/stubs/sleep
+++ b/ctdb/tests/UNIT/eventscripts/stubs/sleep
diff --git a/ctdb/tests/eventscripts/stubs/smnotify b/ctdb/tests/UNIT/eventscripts/stubs/smnotify
index 78710346998..78710346998 100755
--- a/ctdb/tests/eventscripts/stubs/smnotify
+++ b/ctdb/tests/UNIT/eventscripts/stubs/smnotify
diff --git a/ctdb/tests/eventscripts/stubs/ss b/ctdb/tests/UNIT/eventscripts/stubs/ss
index 54ff436edd7..54ff436edd7 100755
--- a/ctdb/tests/eventscripts/stubs/ss
+++ b/ctdb/tests/UNIT/eventscripts/stubs/ss
diff --git a/ctdb/tests/eventscripts/stubs/tdbdump b/ctdb/tests/UNIT/eventscripts/stubs/tdbdump
index 986c5c55499..986c5c55499 100755
--- a/ctdb/tests/eventscripts/stubs/tdbdump
+++ b/ctdb/tests/UNIT/eventscripts/stubs/tdbdump
diff --git a/ctdb/tests/eventscripts/stubs/tdbtool b/ctdb/tests/UNIT/eventscripts/stubs/tdbtool
index 816df3b3f58..816df3b3f58 100755
--- a/ctdb/tests/eventscripts/stubs/tdbtool
+++ b/ctdb/tests/UNIT/eventscripts/stubs/tdbtool
diff --git a/ctdb/tests/eventscripts/stubs/testparm b/ctdb/tests/UNIT/eventscripts/stubs/testparm
index 0473bbf4ea2..0473bbf4ea2 100755
--- a/ctdb/tests/eventscripts/stubs/testparm
+++ b/ctdb/tests/UNIT/eventscripts/stubs/testparm
diff --git a/ctdb/tests/eventscripts/stubs/timeout b/ctdb/tests/UNIT/eventscripts/stubs/timeout
index 1ddce531df4..1ddce531df4 100755
--- a/ctdb/tests/eventscripts/stubs/timeout
+++ b/ctdb/tests/UNIT/eventscripts/stubs/timeout
diff --git a/ctdb/tests/eventscripts/stubs/wbinfo b/ctdb/tests/UNIT/eventscripts/stubs/wbinfo
index 4fc6b98331f..4fc6b98331f 100755
--- a/ctdb/tests/eventscripts/stubs/wbinfo
+++ b/ctdb/tests/UNIT/eventscripts/stubs/wbinfo
diff --git a/ctdb/tests/run_tests.sh b/ctdb/tests/run_tests.sh
index ab0a37f3864..1f12dab9b27 100755
--- a/ctdb/tests/run_tests.sh
+++ b/ctdb/tests/run_tests.sh
@@ -305,7 +305,7 @@ export TEST_SCRIPTS_DIR="${CTDB_TEST_DIR}/scripts"
 unit_tests="
 	UNIT/cunit
 	UNIT/eventd
-	eventscripts
+	UNIT/eventscripts
 	onnode
 	shellcheck
 	takeover