diff --git a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py
index f76e85986311f8ab98643b6bf81f604e6694511f..d889bfa24a219a3aac944213115e5d44ef03ea0b 100644
--- a/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py
+++ b/roles/mail_forwarder/molecule/default/tests/test_connectivity_from_client.py
@@ -1,13 +1,21 @@
 import os
 
+import pytest
 import testinfra.utils.ansible_runner
 
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('client1')
 
+ansible_runner = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE'])
 
-def test_connectivity_from_client(host):
+
+@pytest.mark.parametrize("server",
+                         sorted(
+                             set(ansible_runner.get_hosts('all')) -
+                             set(ansible_runner.get_hosts('helper'))))
+def test_connectivity_from_client(host, server):
     """
     Tests connectivity towards mail forwarder servers from client
     (non-relay). Connectivity should fail for both.
@@ -15,14 +23,6 @@ def test_connectivity_from_client(host):
 
     with host.sudo():
 
-        ping = host.run('hping3 -S -p 25 -c 1 parameters-mandatory-stretch64')
-        assert ping.rc != 0
-        assert "100% packet loss" in ping.stderr
-
-        ping = host.run('hping3 -S -p 25 -c 1 parameters-optional-stretch64')
+        ping = host.run('hping3 -S -p 25 -c 1 %s' % server)
         assert ping.rc != 0
         assert "100% packet loss" in ping.stderr
-
-        ping = host.run('hping3 -S -p 25 -c 1 parameters-no-incoming-stretch64')
-        assert "100% packet loss" in ping.stderr
-        assert ping.rc != 0