diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index bf1c69604b7e68ed46ef71f926044c3d6312f722..60bbe5471f0b58435c08e3c74f7a09236fc914f2 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -58,9 +58,17 @@
 
     - name: Install tools for testing
       apt:
-        name: gnutls-bin
+        name:
+          - gnutls-bin
+          - nmap
         state: present
 
+    - name: Use name provided via CLI when running STARTTLS handshake for XMPP via nmap
+      replace:
+        path: "/usr/share/nmap/nselib/sslcert.lua"
+        regexp: "host\\.name\\)"
+        replace: "host.targetname)"
+
 - hosts: stretch
   become: true
   tasks: