5 files changed, 22 insertions, 10 deletions
diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
index bd97057ec7b..24c00489e2d 100755
--- a/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.001.sh
@@ -4,10 +4,10 @@
 
 define_test "Not managed, clamd not listening"
 
-export CTDB_MANAGES_CLAMD=no
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=no
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
index bfd763403a9..1994a761abf 100755
--- a/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.002.sh
@@ -4,10 +4,10 @@
 
 define_test "Managed, clamd not listening"
 
-export CTDB_MANAGES_CLAMD=yes
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=yes
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 required_result 1 <<EOF
 ERROR: clamd not listening on $CTDB_CLAMD_SOCKET
diff --git a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
index e57f02580c3..685e3a90d40 100755
--- a/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
+++ b/ctdb/tests/eventscripts/31.clamd.monitor.003.sh
@@ -4,10 +4,10 @@
 
 define_test "Managed, clamd listening"
 
-export CTDB_MANAGES_CLAMD=yes
-export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+setup
 
-setup_generic
+CTDB_MANAGES_CLAMD=yes
+CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
 
 unix_socket_listening "$CTDB_CLAMD_SOCKET"
 
diff --git a/ctdb/tests/eventscripts/scripts/31.clamd.sh b/ctdb/tests/eventscripts/scripts/31.clamd.sh
new file mode 100644
index 00000000000..ead3c51c9d9
--- /dev/null
+++ b/ctdb/tests/eventscripts/scripts/31.clamd.sh
@@ -0,0 +1,7 @@
+setup ()
+{
+	export CTDB_MANAGES_CLAMD="yes"
+	export CTDB_CLAMD_SOCKET="/var/run/clamd.sock"
+
+	setup_unix_listen
+}
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 75f882515a0..b29f976e1ed 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -91,7 +91,7 @@ setup_generic ()
     setup_dbdir
     setup_date
 
-    export FAKE_TCP_LISTEN FAKE_NETSTAT_UNIX_LISTEN
+    export FAKE_TCP_LISTEN
 }
 
 tcp_port_down ()
@@ -102,6 +102,11 @@ tcp_port_down ()
     done
 }
 
+setup_unix_listen ()
+{
+	export FAKE_NETSTAT_UNIX_LISTEN="$*"
+}
+
 unix_socket_listening ()
 {
 	_s="$1"