diff --git a/tests/sndrcv_kafka_multi.sh b/tests/sndrcv_kafka_multi.sh
index 27fab2b2a..959e7b005 100755
--- a/tests/sndrcv_kafka_multi.sh
+++ b/tests/sndrcv_kafka_multi.sh
@@ -6,11 +6,15 @@ export TESTMESSAGES=10000
 echo ===============================================================================
 echo \[sndrcv_kafka_multi.sh\]: Create multiple kafka/zookeeper instances and static topic
 . $srcdir/diag.sh download-kafka
-. $srcdir/diag.sh stop-zookeeper
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk1'
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk2'
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk3'
 . $srcdir/diag.sh stop-kafka '.dep_wrk1'
 . $srcdir/diag.sh stop-kafka '.dep_wrk2'
 . $srcdir/diag.sh stop-kafka '.dep_wrk3'
-. $srcdir/diag.sh start-zookeeper '.multi'
+. $srcdir/diag.sh start-zookeeper '.dep_wrk1'
+. $srcdir/diag.sh start-zookeeper '.dep_wrk2'
+. $srcdir/diag.sh start-zookeeper '.dep_wrk3'
 . $srcdir/diag.sh start-kafka '.dep_wrk1'
 . $srcdir/diag.sh start-kafka '.dep_wrk2'
 . $srcdir/diag.sh start-kafka '.dep_wrk3'
@@ -31,7 +35,7 @@ export RSYSLOG_DEBUGLOG="log2"
 . $srcdir/diag.sh tcpflood -m$TESTMESSAGES -i1
 
 echo \[sndrcv_kafka_multi.sh\]: Sleep to give rsyslog instances time to process data ...
-sleep 10 
+sleep 20 
 
 echo \[sndrcv_kafka_multi.sh\]: Stopping sender instance [omkafka]
 . $srcdir/diag.sh shutdown-when-empty
@@ -49,4 +53,6 @@ echo \[sndrcv_kafka.sh\]: stop kafka instances
 . $srcdir/diag.sh stop-kafka '.dep_wrk1'
 . $srcdir/diag.sh stop-kafka '.dep_wrk2'
 . $srcdir/diag.sh stop-kafka '.dep_wrk3'
-. $srcdir/diag.sh stop-zookeeper '.multi'
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk1'
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk2'
+. $srcdir/diag.sh stop-zookeeper '.dep_wrk3'
diff --git a/tests/testsuites/kafka-server.dep_wrk1.properties b/tests/testsuites/kafka-server.dep_wrk1.properties
index cf760e6c7..294c42362 100644
--- a/tests/testsuites/kafka-server.dep_wrk1.properties
+++ b/tests/testsuites/kafka-server.dep_wrk1.properties
@@ -32,8 +32,8 @@ message.max.bytes=1000000
 
 num.network.threads=2
 num.io.threads=2
-num.partitions=1
-#num.partitions=100
+#num.partitions=1
+num.partitions=100
 num.recovery.threads.per.data.dir=1
 
 num.replica.fetchers=1
@@ -59,7 +59,7 @@ queued.max.requests=500
 
 #zookeeper.connect=zoo1.internal:22181,zoo2.internal:22181,zoo3.internal:22181
 #zookeeper.connection.timeout.ms=6000
-zookeeper.connect=localhost:22181/kafka
+zookeeper.connect=localhost:22181/kafka,localhost:22182/kafka,localhost:22183/kafka
 zookeeper.connection.timeout.ms=6000
 zookeeper.session.timeout.ms=6000
 zookeeper.sync.time.ms=2000
diff --git a/tests/testsuites/kafka-server.dep_wrk2.properties b/tests/testsuites/kafka-server.dep_wrk2.properties
index 0d270ab6c..3f6828f64 100644
--- a/tests/testsuites/kafka-server.dep_wrk2.properties
+++ b/tests/testsuites/kafka-server.dep_wrk2.properties
@@ -32,8 +32,8 @@ message.max.bytes=1000000
 
 num.network.threads=2
 num.io.threads=2
-num.partitions=1
-#num.partitions=100
+#num.partitions=1
+num.partitions=100
 num.recovery.threads.per.data.dir=1
 
 num.replica.fetchers=1
@@ -59,7 +59,7 @@ queued.max.requests=500
 
 #zookeeper.connect=zoo1.internal:22181,zoo2.internal:22181,zoo3.internal:22181
 #zookeeper.connection.timeout.ms=6000
-zookeeper.connect=localhost:22181/kafka
+zookeeper.connect=localhost:22181/kafka,localhost:22182/kafka,localhost:22183/kafka
 zookeeper.connection.timeout.ms=6000
 zookeeper.session.timeout.ms=6000
 zookeeper.sync.time.ms=2000
diff --git a/tests/testsuites/kafka-server.dep_wrk3.properties b/tests/testsuites/kafka-server.dep_wrk3.properties
index fd95bb1d5..a1fdd2feb 100644
--- a/tests/testsuites/kafka-server.dep_wrk3.properties
+++ b/tests/testsuites/kafka-server.dep_wrk3.properties
@@ -32,8 +32,8 @@ message.max.bytes=1000000
 
 num.network.threads=2
 num.io.threads=2
-num.partitions=1
-#num.partitions=100
+#num.partitions=1
+num.partitions=100
 num.recovery.threads.per.data.dir=1
 
 num.replica.fetchers=1
@@ -59,7 +59,7 @@ queued.max.requests=500
 
 #zookeeper.connect=zoo1.internal:22181,zoo2.internal:22181,zoo3.internal:22181
 #zookeeper.connection.timeout.ms=6000
-zookeeper.connect=localhost:22181/kafka
+zookeeper.connect=localhost:22181/kafka,localhost:22182/kafka,localhost:22183/kafka
 zookeeper.connection.timeout.ms=6000
 zookeeper.session.timeout.ms=6000
 zookeeper.sync.time.ms=2000
diff --git a/tests/testsuites/sndrcv_kafka_multi_sender.conf b/tests/testsuites/sndrcv_kafka_multi_sender.conf
index 61ab61718..20c425545 100644
--- a/tests/testsuites/sndrcv_kafka_multi_sender.conf
+++ b/tests/testsuites/sndrcv_kafka_multi_sender.conf
@@ -9,8 +9,7 @@ template(name="outfmt" type="string" string="%msg%\n")
 ruleset(name="omkafka") {
 	action( type="omkafka" 
 		name="kafka-fwd" 
-#		brokers=["localhost:29092", "localhost:29093", "localhost:29094"] 
-		broker="localhost:29092" 
+		broker=["localhost:29092", "localhost:29093", "localhost:29094"] 
 		topic="static" 
 		template="outfmt" 
 		partitions.auto="on"
@@ -24,9 +23,6 @@ ruleset(name="omkafka") {
 
 }
 
-
-
-
 ruleset(name="omkafka1") {
 	action(name="kafka-fwd" type="omkafka" topic="static" broker="localhost:29092" template="outfmt" partitions.auto="on")
 }
diff --git a/tests/testsuites/zoo.dep_wrk1.cfg b/tests/testsuites/zoo.dep_wrk1.cfg
index f3ff9bb9f..0afe51aea 100644
--- a/tests/testsuites/zoo.dep_wrk1.cfg
+++ b/tests/testsuites/zoo.dep_wrk1.cfg
@@ -1,5 +1,20 @@
+#---  Do we need this for the test? 
+#server.1=localhost:2889:3888
+#server.2=localhost:3889:4888
+#server.3=localhost:4889:5888
+#--- 
+
+# The number of milliseconds of each tick
 tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
 initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
 syncLimit=5
+# the directory where the snapshot is stored.
+# do not use /tmp for storage, /tmp here is just
+# example sakes.
 dataDir=zk_data_dir
-clientPort=2181
+# the port at which the clients will connect
+clientPort=22181
diff --git a/tests/testsuites/zoo.dep_wrk2.cfg b/tests/testsuites/zoo.dep_wrk2.cfg
index 0b8b5f197..643e3996c 100644
--- a/tests/testsuites/zoo.dep_wrk2.cfg
+++ b/tests/testsuites/zoo.dep_wrk2.cfg
@@ -1,5 +1,20 @@
+#---  Do we need this for the test? 
+#server.1=localhost:2889:3888
+#server.2=localhost:3889:4888
+#server.3=localhost:4889:5888
+#--- 
+
+# The number of milliseconds of each tick
 tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
 initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
 syncLimit=5
-dataDir=zk_data_dir2
-clientPort=2182
+# the directory where the snapshot is stored.
+# do not use /tmp for storage, /tmp here is just
+# example sakes.
+dataDir=zk_data_dir
+# the port at which the clients will connect
+clientPort=22182
diff --git a/tests/testsuites/zoo.dep_wrk3.cfg b/tests/testsuites/zoo.dep_wrk3.cfg
index bfc65149c..8d4e25998 100644
--- a/tests/testsuites/zoo.dep_wrk3.cfg
+++ b/tests/testsuites/zoo.dep_wrk3.cfg
@@ -1,5 +1,20 @@
+#---  Do we need this for the test? 
+#server.1=localhost:2889:3888
+#server.2=localhost:3889:4888
+#server.3=localhost:4889:5888
+#--- 
+
+# The number of milliseconds of each tick
 tickTime=2000
+# The number of ticks that the initial
+# synchronization phase can take
 initLimit=10
+# The number of ticks that can pass between
+# sending a request and getting an acknowledgement
 syncLimit=5
-dataDir=zk_data_dir3
-clientPort=2183
+# the directory where the snapshot is stored.
+# do not use /tmp for storage, /tmp here is just
+# example sakes.
+dataDir=zk_data_dir
+# the port at which the clients will connect
+clientPort=22183
diff --git a/tests/testsuites/zoo.multi.cfg b/tests/testsuites/zoo.multi.cfg
deleted file mode 100644
index 0afe51aea..000000000
--- a/tests/testsuites/zoo.multi.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-#---  Do we need this for the test? 
-#server.1=localhost:2889:3888
-#server.2=localhost:3889:4888
-#server.3=localhost:4889:5888
-#--- 
-
-# The number of milliseconds of each tick
-tickTime=2000
-# The number of ticks that the initial
-# synchronization phase can take
-initLimit=10
-# The number of ticks that can pass between
-# sending a request and getting an acknowledgement
-syncLimit=5
-# the directory where the snapshot is stored.
-# do not use /tmp for storage, /tmp here is just
-# example sakes.
-dataDir=zk_data_dir
-# the port at which the clients will connect
-clientPort=22181