diff --git a/roles/xmpp_server/molecule/default/playbook.yml b/roles/xmpp_server/molecule/default/playbook.yml
index ca17d4a91af07aabb65aec7f5d8c18461c48750b..28027f6e59874d5ac59044ec106661d2b9e80c76 100644
--- a/roles/xmpp_server/molecule/default/playbook.yml
+++ b/roles/xmpp_server/molecule/default/playbook.yml
@@ -1,55 +1,6 @@
 ---
 
-- hosts: parameters-mandatory
-  become: yes
+- hosts: parameters-mandatory,parameters-optional
+  become: true
   roles:
-    - role: xmpp_server
-      xmpp_administrators:
-        - john.doe@domain1
-      xmpp_ldap_base_dn: dc=local
-      xmpp_ldap_password: prosodypassword
-      xmpp_ldap_server: ldap-server
-
-      # Common parameters (general, not role).
-      tls_certificate_dir: tests/data/x509/
-      tls_private_key_dir: tests/data/x509/
-
-      # common
-      ca_certificates:
-        testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
-
-- hosts: parameters-optional
-  become: yes
-  roles:
-    - role: xmpp_server
-      xmpp_administrators:
-        - jane.doe@domain2
-        - mick.doe@domain3
-      xmpp_domains:
-        - domain2
-        - domain3
-      xmpp_ldap_base_dn: dc=local
-      xmpp_ldap_password: prosodypassword
-      xmpp_ldap_server: ldap-server
-      xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/parameters-optional_xmpp.cert.pem') }}"
-      xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/parameters-optional_xmpp.key.pem') }}"
-
-      # Common parameters (general, not role).
-      tls_certificate_dir: tests/data/x509/
-      tls_private_key_dir: tests/data/x509/
-
-      # common
-      ca_certificates:
-        testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
-
-      # backup_client
-      enable_backup: yes
-      backup_client_username: bak-parameters-optional
-      backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}"
-      backup_server: backup-server
-      backup_server_host_ssh_public_keys:
-        - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}"
-        - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}"
-      backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}"
+    - xmpp_server