diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml
index 67d0a452ca7869733dcd433c4a1f6211fc7cbeb4..3a1939f5da4db3622842f63449e0573f883f75b3 100644
--- a/roles/common/molecule/default/prepare.yml
+++ b/roles/common/molecule/default/prepare.yml
@@ -51,7 +51,31 @@
         name: apt-cacher-ng
         state: present
 
-- hosts: all
+- hosts: client
+  become: true
+  tasks:
+
+    - name: Install tool for testing TCP connectivity
+      apt:
+        name: hping3
+        state: present
+
+    - name: Set-up /etc/hosts with entries for all servers
+      lineinfile:
+        path: /etc/hosts
+        regexp: "^{{ item.key }}"
+        line: "{{ item.key }} {{ item.value }}"
+        owner: root
+        group: root
+        mode: 0644
+        state: present
+      with_dict:
+        10.31.127.11: parameters-mandatory-stretch64
+        10.31.127.12: parameters-optional-stretch64
+        10.31.127.21: parameters-mandatory-buster64
+        10.31.127.22: parameters-optional-buster64
+
+- hosts: parameters-mandatory,parameters-optional
   become: true
   tasks:
 
@@ -72,8 +96,6 @@
       with_dict:
         10.31.127.3: client1
         10.31.127.4: client2
-        10.31.127.5: parameters-mandatory
-        10.31.127.6: parameters-optional
 
 - hosts: parameters-mandatory,parameters-optional
   become: true