diff --git a/testsuite/databases/kafka/pytest_plugin.py b/testsuite/databases/kafka/pytest_plugin.py
index 882c81e8..bb3d210a 100644
--- a/testsuite/databases/kafka/pytest_plugin.py
+++ b/testsuite/databases/kafka/pytest_plugin.py
@@ -33,7 +33,7 @@ def pytest_service_register(register_service):
 async def _kafka_global_producer(
     _kafka_service,
     _bootstrap_servers,
-) -> typing.AsyncGenerator[classes.KafkaConsumer, None]:
+) -> typing.AsyncGenerator[classes.KafkaProducer, None]:
     producer = classes.KafkaProducer(
         enabled=_kafka_service,
         bootstrap_servers=_bootstrap_servers,
@@ -73,7 +73,9 @@ async def _kafka_global_consumer(
 
 
 @pytest.fixture
-async def kafka_consumer(_kafka_global_consumer):
+async def kafka_consumer(
+    _kafka_global_consumer,
+) -> typing.AsyncGenerator[classes.KafkaConsumer, None]:
     """
     Per test Kafka consumer instance.
 
diff --git a/testsuite/databases/kafka/scripts/service-kafka b/testsuite/databases/kafka/scripts/service-kafka
index 39fdb367..f646bbb4 100755
--- a/testsuite/databases/kafka/scripts/service-kafka
+++ b/testsuite/databases/kafka/scripts/service-kafka
@@ -46,11 +46,11 @@ start_kafka() {
     # In such keys, unexpectedly, testsuite server
     # may start interfact with launched one without any errors.
     # To avoid such cases, do not let the ports be binded by another applications at all.
-    if netstat --listening | grep $KAFKA_SERVER_PORT; then
+    if netstat --listening --tcp --numeric | awk '{print $4}' | grep $KAFKA_SERVER_PORT; then
         echo "Maybe Kafka server is already running on the $KAFKA_SERVER_PORT port."
         echo "Choose another port: specify TESTSUITE_KAFKA_SERVER_PORT environment variable."
         exit 1
-    elif netstat --listening | grep $KAFKA_CONTROLLER_PORT; then
+    elif netstat --listening --tcp --numeric | awk '{print $4}' | grep $KAFKA_CONTROLLER_PORT; then
         echo "Maybe Kafka controller is already running on the $KAFKA_CONTROLLER_PORT port."
         echo "Choose another port: specify TESTSUITE_KAFKA_CONTROLLER_PORT environment variable."
         exit 1