diff --git a/roles/xmpp_server/molecule/default/cleanup.yml b/roles/xmpp_server/molecule/default/cleanup.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c99ee79c29bc84b49f955fbcdf8734cda064bc64
--- /dev/null
+++ b/roles/xmpp_server/molecule/default/cleanup.yml
@@ -0,0 +1,15 @@
+---
+
+- name: Clean-up fixtures
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+
+    - name: Remove X.509 material
+      file:
+        path: "{{ item }}"
+        state: absent
+      with_items:
+        - "tests/data/x509"
+        - "tests/data/.gimmecert"
diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml
index 2be4418cc81730b58d194afe184d881895d2a4fb..176d3f666b622b5a10e096cc455fae580cef697c 100644
--- a/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml
+++ b/roles/xmpp_server/molecule/default/group_vars/parameters-mandatory.yml
@@ -5,9 +5,9 @@ xmpp_administrators:
 xmpp_ldap_base_dn: dc=local
 xmpp_ldap_password: prosodypassword
 xmpp_ldap_server: ldap-server
-xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_xmpp.cert.pem') }}"
-xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_xmpp.key.pem') }}"
+xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.cert.pem') }}"
+xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.key.pem') }}"
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
index e22e5353dc8db1adba44bf7d3e05dc85358534f1..81ee7b19622e1aebc0c8bd01ba9212b47e200b2e 100644
--- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
+++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml
@@ -10,12 +10,12 @@ xmpp_ldap_base_dn: dc=local
 xmpp_ldap_password: prosodypassword
 xmpp_ldap_server: ldap-server
 xmpp_prosody_package: prosody-0.9
-xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_xmpp.cert.pem') }}"
-xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_xmpp.key.pem') }}"
+xmpp_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.cert.pem') }}"
+xmpp_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_xmpp.key.pem') }}"
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
 
 # backup_client
 enable_backup: true
diff --git a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
index 7fff83fc57a1e7f18c8d30e85a8785c5a9f0a09c..6b766bd081b02e4d79f56c6b15afd03a526034f5 100644
--- a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
+++ b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
@@ -11,12 +11,12 @@ ldap_server_domain: "local"
 ldap_server_groups:
   - name: xmpp
 ldap_server_organization: "Example"
-ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/ldap-server_ldap.cert.pem') }}"
-ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/ldap-server_ldap.key.pem') }}"
+ldap_server_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/ldap-server_ldap.cert.pem') }}"
+ldap_server_tls_key: "{{ lookup('file', 'tests/data/x509/server/ldap-server_ldap.key.pem') }}"
 
 # common
 ca_certificates:
-  testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"
 
 # ldap_client
 ldap_client_config:
diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml
index 1919a1d306fa228098f69f7bf23825c8a7f6fb6f..7478ecf5830b700cb6e22804a34d928e0357af67 100644
--- a/roles/xmpp_server/molecule/default/molecule.yml
+++ b/roles/xmpp_server/molecule/default/molecule.yml
@@ -65,6 +65,8 @@ platforms:
 
 provisioner:
   name: ansible
+  playbooks:
+    cleanup: cleanup.yml
   config_options:
     defaults:
       force_valid_group_names: "ignore"
diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index becb853f2c2ada341780491839fb785e492a6ab6..bf1c69604b7e68ed46ef71f926044c3d6312f722 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -1,5 +1,43 @@
 ---
 
+- name: Set-up fixtures
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  tasks:
+
+    - name: Initialise CA hierarchy
+      command: "gimmecert init"
+      args:
+        creates: ".gimmecert/ca/level1.cert.pem"
+        chdir: "tests/data/"
+
+    - name: Generate server private keys and certificates
+      command:
+      args:
+        chdir: "tests/data/"
+        creates: ".gimmecert/server/{{ item.name }}.cert.pem"
+        argv: "{{ ['gimmecert', 'server', item.name] + item.fqdn }}"
+      with_items:
+        - name: ldap-server_ldap
+          fqdn:
+            - ldap-server
+        - name: parameters-mandatory-stretch64.domain1_xmpp
+          fqdn:
+            - parameters-mandatory
+            - domain1
+        - name: parameters-optional-stretch64_xmpp
+          fqdn:
+            - parameters-optional
+            - domain2
+            - domain3
+
+    - name: Set-up link to generated X.509 material
+      file:
+        src: ".gimmecert"
+        dest: "tests/data/x509"
+        state: link
+
 - name: Prepare
   hosts: all
   gather_facts: false
@@ -53,7 +91,7 @@
 
     - name: Deploy CA certificate
       copy:
-        src: tests/data/x509/ca.cert.pem
+        src: tests/data/x509/ca/level1.cert.pem
         dest: /usr/local/share/ca-certificates/testca.crt
         owner: root
         group: root
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/ca.cert.pem b/roles/xmpp_server/molecule/default/tests/data/x509/ca.cert.pem
deleted file mode 100644
index a41785fdd72787232ac39d645f36d2a0b7b04c11..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/ca.cert.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWTCCAsGgAwIBAgIMWVEJAy6O6Abooz68MA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI2MTMxNTQ3WhcNMzcwNjIxMTMx
-NTQ3WjBIMSIwIAYDVQQDExlFeGFtcGxlIEluYy4gVGVzdCBTaXRlIENBMRUwEwYD
-VQQKEwxFeGFtcGxlIEluYy4xCzAJBgNVBAYTAlNFMIIBojANBgkqhkiG9w0BAQEF
-AAOCAY8AMIIBigKCAYEAufYIYdFLn8Xo8a3c0cUj7s9WEUYKDE6ETmsNFdZee2hK
-qP2Li9bSr+vPjgMfi2UfxX/+i9x6LGqsIUxXVgrKlOf7R8bFg/runUI+4X1mZMJw
-dBc1POhjkdfRbtfOdu1LtztW4Pc2tnyrAtmhcNHUCXNGRfDNpFKtIFe4OTA/4/eP
-1EAyInHNqO2F8UgL8EDUMg9AQd4InVCPYRNlsv9j9qBVMjZiX7hoBC8k1laNkd4T
-IdV6zet3+M5Fp/W9lvxFI1yPXw/xWM7K9R3nepunKniuGmjBsac/ZHCUFqJaHz5K
-pXyMpSH1GTXOnIKFOldK4NYOzjCOR9Z+k63oJPZ+c7R9cKAZ7DERhS8X6MiykQ2s
-hDY68i7HSZd9Dy5oLlH63evbi/tWJSG9mE/UamYuzORKR4PNwixaKQbteiDU59wK
-azH5yQNGIqMSGkNgSsj9QW2NPkyNskuzCP04f77V/wSpum5PIygyuLidge9A+Vux
-eb5v7XBS8Zp3Wn78JYrlAgMBAAGjQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0P
-AQH/BAUDAwcGADAdBgNVHQ4EFgQUN2vbkxxpfpJMa99zhfiEllmBT2swDQYJKoZI
-hvcNAQELBQADggGBADNZ9eJA3Jm5TJQoDct+FZOc16XZDlteGBxVJj+aQUlBFlJK
-itvW/reR4SwZF/QRtCIzY7HN0rx0FVvfGR4sIcN2MALG+4Beee5nZR3KsNHhx895
-5ml7vqfNhnn/3/Gd7quqb2FskALfHAciuL+y0n/KcnnJ/3wZKR6xc5ON1VrwHSyI
-ENxRC8/oeO9SBc9V5gG5CyELftUiGBE73IIGjV/wXiwBvgwPB+j8vrv5nQrKPsLk
-b9ngSts/JSdiQH3cIbBpNoWz8Q8OIoQTt99GUKAScJX4UO7W5EHNmcCtCtOpgRg+
-Y49auOe/6A1n4rsLANZlDelhwCASQtZ04DdFl5QQpTuIOmd4l4KuNpqQ5Px+sxFu
-oPenBiQkXuQn9rQaFTTSc9jVBoumRp61P0mvoGusRzjYYvdL8zYoH/246eliWgyy
-60+/lgmDXpwf0a2d3fDTxuBmP1HlJYLUsS6ij+GKGgAOTCGmzygmyPOroDae+XOI
-G2o8G6ziU8d8RICIng==
------END CERTIFICATE-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/ca.key.pem b/roles/xmpp_server/molecule/default/tests/data/x509/ca.key.pem
deleted file mode 100644
index d2f3ab97e995f18f395d78cd62af20368aeb7b0f..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/ca.key.pem
+++ /dev/null
@@ -1,182 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: High (3072 bits)
-
-modulus:
-	00:b9:f6:08:61:d1:4b:9f:c5:e8:f1:ad:dc:d1:c5:23
-	ee:cf:56:11:46:0a:0c:4e:84:4e:6b:0d:15:d6:5e:7b
-	68:4a:a8:fd:8b:8b:d6:d2:af:eb:cf:8e:03:1f:8b:65
-	1f:c5:7f:fe:8b:dc:7a:2c:6a:ac:21:4c:57:56:0a:ca
-	94:e7:fb:47:c6:c5:83:fa:ee:9d:42:3e:e1:7d:66:64
-	c2:70:74:17:35:3c:e8:63:91:d7:d1:6e:d7:ce:76:ed
-	4b:b7:3b:56:e0:f7:36:b6:7c:ab:02:d9:a1:70:d1:d4
-	09:73:46:45:f0:cd:a4:52:ad:20:57:b8:39:30:3f:e3
-	f7:8f:d4:40:32:22:71:cd:a8:ed:85:f1:48:0b:f0:40
-	d4:32:0f:40:41:de:08:9d:50:8f:61:13:65:b2:ff:63
-	f6:a0:55:32:36:62:5f:b8:68:04:2f:24:d6:56:8d:91
-	de:13:21:d5:7a:cd:eb:77:f8:ce:45:a7:f5:bd:96:fc
-	45:23:5c:8f:5f:0f:f1:58:ce:ca:f5:1d:e7:7a:9b:a7
-	2a:78:ae:1a:68:c1:b1:a7:3f:64:70:94:16:a2:5a:1f
-	3e:4a:a5:7c:8c:a5:21:f5:19:35:ce:9c:82:85:3a:57
-	4a:e0:d6:0e:ce:30:8e:47:d6:7e:93:ad:e8:24:f6:7e
-	73:b4:7d:70:a0:19:ec:31:11:85:2f:17:e8:c8:b2:91
-	0d:ac:84:36:3a:f2:2e:c7:49:97:7d:0f:2e:68:2e:51
-	fa:dd:eb:db:8b:fb:56:25:21:bd:98:4f:d4:6a:66:2e
-	cc:e4:4a:47:83:cd:c2:2c:5a:29:06:ed:7a:20:d4:e7
-	dc:0a:6b:31:f9:c9:03:46:22:a3:12:1a:43:60:4a:c8
-	fd:41:6d:8d:3e:4c:8d:b2:4b:b3:08:fd:38:7f:be:d5
-	ff:04:a9:ba:6e:4f:23:28:32:b8:b8:9d:81:ef:40:f9
-	5b:b1:79:be:6f:ed:70:52:f1:9a:77:5a:7e:fc:25:8a
-	e5:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	00:ae:08:f9:f3:41:c2:fa:b6:67:b9:b7:33:50:06:a6
-	08:5b:76:7b:18:07:53:59:30:2d:8b:b6:65:57:88:79
-	0a:33:c5:4f:f4:87:5c:f7:34:b9:06:38:2b:e8:1b:b6
-	fa:33:06:04:9d:b4:2b:8a:e2:12:51:df:76:65:0a:18
-	69:9f:69:e5:d4:bb:09:37:90:95:10:68:74:f3:bd:1e
-	53:72:96:d3:19:79:f5:2b:2a:54:c6:a6:6b:c5:c8:3b
-	70:7e:fd:43:e3:aa:b9:43:b4:0c:ff:cf:d9:6d:12:92
-	d4:7d:53:a9:25:21:ef:c5:88:4d:1a:8b:48:ca:45:20
-	fe:91:56:dc:f5:8e:92:df:1c:57:9e:e1:1e:c2:3d:89
-	0e:8e:03:03:ea:20:f8:02:f2:60:1d:43:e0:0b:d3:44
-	24:8e:0c:ed:bf:43:f5:bd:49:6b:91:0b:72:a4:f2:3d
-	2f:8e:cc:3d:54:7e:de:fe:1a:96:41:4e:5d:87:9f:84
-	5b:3c:92:8c:a7:73:e4:00:6a:13:02:44:d7:ad:89:31
-	50:ee:d2:ec:af:6e:47:e4:9b:59:3d:93:58:d5:71:1e
-	64:f7:ac:68:85:ca:86:f7:6a:25:b0:ff:56:77:af:f4
-	50:43:49:0b:22:31:6b:79:6f:f2:74:df:7c:1b:e1:4d
-	12:e7:ba:1e:65:38:ad:27:38:3b:50:6d:d0:e6:36:0e
-	b9:25:27:d8:31:e4:2e:be:01:b4:d8:fe:70:d2:12:ff
-	bb:7b:3f:f4:dc:51:83:17:33:8e:26:68:d1:89:3e:e5
-	67:00:72:e0:0f:92:83:ba:62:55:db:ae:84:7d:5e:cc
-	7f:72:d0:dc:f3:88:9e:22:07:78:9a:e1:4e:e3:34:30
-	14:56:fb:80:93:f2:be:c3:cd:70:1b:fe:b0:da:41:3c
-	28:9f:a8:0e:1c:79:1b:52:9a:a8:a8:cf:0e:16:f9:c0
-	db:99:e9:df:4a:c3:66:7c:4f:a1:27:eb:f0:06:5e:4d
-	41:
-
-prime1:
-	00:f7:41:ab:a5:a1:23:37:e6:be:fe:85:e9:96:30:1b
-	c4:33:50:c8:85:5e:44:46:51:1d:3d:28:8a:21:58:2d
-	3b:82:11:dc:bc:0d:76:c5:20:45:a2:34:c9:cb:85:3b
-	de:76:06:bc:c1:9f:4d:39:c3:63:ad:5d:0d:fe:bc:ab
-	3f:2c:76:67:29:d9:a5:3d:38:af:a3:09:ff:09:ec:e9
-	15:85:04:e6:70:87:2e:ee:a0:78:26:73:a0:74:60:18
-	ad:f7:8c:1a:f3:4c:07:53:b9:b8:9d:a6:d1:3f:8b:a3
-	13:87:16:a0:40:11:36:9b:f4:1e:b1:ba:b9:00:34:15
-	d2:29:0d:e8:90:f7:c5:dc:c1:93:d3:e5:6e:6c:13:24
-	0f:11:cb:0d:37:ea:f9:f9:89:8e:91:71:4f:1d:5b:17
-	f8:aa:94:8d:43:bf:ac:dd:d6:ec:3c:bc:70:d1:51:13
-	76:77:ef:9a:91:6d:4d:59:32:e6:97:93:d8:bb:14:60
-	fd:
-
-prime2:
-	00:c0:89:79:a8:73:86:20:c7:e9:0d:35:56:a4:d0:a8
-	37:21:76:25:e9:2f:9f:c0:e6:45:f6:27:54:56:4a:dd
-	0e:c5:43:e4:ec:c5:20:97:16:5b:fc:ef:86:57:b1:e6
-	ce:8b:e9:58:d4:a4:c3:a0:6d:f6:57:6d:8a:09:eb:d1
-	de:63:42:81:76:9f:4c:40:f7:48:d3:99:1b:23:7d:eb
-	8e:52:7b:e8:94:94:f3:d5:49:49:6e:da:38:c2:f6:b6
-	0e:27:7a:f9:4d:2b:6c:aa:a0:de:c7:b1:78:06:ee:7c
-	5f:7e:33:6d:05:44:9b:9a:ca:90:12:61:a4:96:46:9b
-	66:d1:8b:4c:e9:f1:21:2f:6c:26:aa:4f:56:3d:d7:03
-	8c:bf:33:24:a5:01:f5:87:a3:b2:d9:2b:82:2b:42:c4
-	5a:5d:40:84:d2:d8:7d:29:6f:69:21:a2:0b:ca:7c:46
-	34:b7:8f:29:11:2f:62:3e:87:a0:62:50:34:21:89:4a
-	09:
-
-coefficient:
-	0b:7d:31:bf:b5:89:0a:c8:2c:28:4c:41:98:ee:6f:55
-	e5:69:d3:b2:1c:66:c4:da:1d:79:2d:8b:03:28:30:a3
-	c9:6f:7e:94:a2:72:76:ce:1a:32:27:c6:f9:78:ae:d7
-	d0:d8:af:a1:76:54:ff:2b:97:a4:5d:b5:ea:f6:a5:b3
-	08:a1:9c:46:7c:7d:80:38:32:a9:e4:09:7d:b0:e4:1f
-	e2:e8:e0:ef:84:f4:07:8e:4c:bc:02:72:ad:43:e6:c7
-	5a:e7:77:d1:81:27:8e:a6:bb:23:dd:14:69:cb:08:02
-	68:97:b8:ff:7f:c0:4f:43:86:d1:d8:8e:7e:9a:ae:1d
-	c5:ee:ae:19:03:d9:cb:f1:31:b5:7b:72:6c:cb:f8:d1
-	c1:07:9a:e5:09:8f:2a:7a:92:4b:e9:1e:a0:7d:aa:ae
-	bd:87:60:be:77:b7:ab:de:c9:54:13:e9:6a:3c:82:cb
-	94:e2:4c:bc:35:36:12:d6:0f:e1:77:58:ff:08:4e:38
-	
-
-exp1:
-	00:cb:b2:2f:5d:91:45:b9:5d:00:86:20:fe:51:fb:aa
-	34:55:ee:3c:74:1b:37:f6:12:07:1b:86:55:5d:a9:0e
-	02:93:62:71:cd:fe:ed:94:f2:c4:4b:20:60:0a:a9:e5
-	ab:9c:e2:6a:08:bd:5b:5a:b6:0c:5d:1b:67:57:30:49
-	88:0e:f2:30:85:3a:c7:b5:8b:08:af:31:a2:09:a4:42
-	55:b7:33:55:40:e9:2d:91:eb:63:70:92:1b:63:24:73
-	d0:86:3a:c7:4d:1e:9a:7e:b0:67:56:81:c2:ab:2e:37
-	97:f3:d7:81:07:a6:e6:ad:4e:4d:27:30:64:0e:b5:da
-	30:3c:20:38:33:8d:dc:54:c4:a9:2b:8d:3d:0e:0e:2a
-	cb:bb:65:e3:aa:e8:8b:2d:b7:d4:5b:1f:d5:04:a3:32
-	39:6b:16:5c:d6:ae:87:14:6f:66:49:97:18:fe:68:63
-	b7:5a:91:6b:6e:59:74:ba:82:83:93:e6:7a:4b:8d:3b
-	65:
-
-exp2:
-	17:76:29:1e:ff:c4:ce:65:cd:de:50:2b:98:b5:dc:69
-	ab:68:2c:42:78:0d:2d:82:61:f0:16:e6:ce:05:1d:5e
-	d9:66:e6:94:7b:88:f7:20:40:61:58:06:b4:d4:f6:dd
-	20:6b:74:e9:a4:92:3a:10:6c:3e:47:18:d5:10:a9:68
-	42:0c:2e:9e:77:d6:e0:eb:c1:32:17:ac:18:ed:15:31
-	28:97:f4:c5:76:49:28:2a:60:0a:64:09:1a:a8:d9:92
-	6b:f9:2e:3b:db:18:c8:ca:05:9b:ab:e2:86:65:b5:3e
-	25:b0:ba:8e:33:c8:0a:5a:b8:a7:a4:c2:5b:95:8b:06
-	42:6e:89:16:d0:cd:4c:6c:0f:62:1d:7c:d2:d8:4a:94
-	72:10:17:5d:0c:1a:11:47:3f:59:fb:55:47:54:41:7d
-	09:73:fd:3b:7c:29:f4:4c:a1:30:fa:00:19:d2:7e:f3
-	99:92:96:5c:83:bb:a3:06:ff:e2:3b:07:bf:36:6d:91
-	
-
-
-Public Key PIN:
-	pin-sha256:PbmtyJHWZjCUw6fCLCaAjguYDFU4CDEaD02/yWpD5bI=
-Public Key ID:
-	sha256:3db9adc891d6663094c3a7c22c26808e0b980c553808311a0f4dbfc96a43e5b2
-	sha1:376bdb931c697e924c6bdf7385f8849659814f6b
-
------BEGIN RSA PRIVATE KEY-----
-MIIG5AIBAAKCAYEAufYIYdFLn8Xo8a3c0cUj7s9WEUYKDE6ETmsNFdZee2hKqP2L
-i9bSr+vPjgMfi2UfxX/+i9x6LGqsIUxXVgrKlOf7R8bFg/runUI+4X1mZMJwdBc1
-POhjkdfRbtfOdu1LtztW4Pc2tnyrAtmhcNHUCXNGRfDNpFKtIFe4OTA/4/eP1EAy
-InHNqO2F8UgL8EDUMg9AQd4InVCPYRNlsv9j9qBVMjZiX7hoBC8k1laNkd4TIdV6
-zet3+M5Fp/W9lvxFI1yPXw/xWM7K9R3nepunKniuGmjBsac/ZHCUFqJaHz5KpXyM
-pSH1GTXOnIKFOldK4NYOzjCOR9Z+k63oJPZ+c7R9cKAZ7DERhS8X6MiykQ2shDY6
-8i7HSZd9Dy5oLlH63evbi/tWJSG9mE/UamYuzORKR4PNwixaKQbteiDU59wKazH5
-yQNGIqMSGkNgSsj9QW2NPkyNskuzCP04f77V/wSpum5PIygyuLidge9A+Vuxeb5v
-7XBS8Zp3Wn78JYrlAgMBAAECggGBAK4I+fNBwvq2Z7m3M1AGpghbdnsYB1NZMC2L
-tmVXiHkKM8VP9Idc9zS5Bjgr6Bu2+jMGBJ20K4riElHfdmUKGGmfaeXUuwk3kJUQ
-aHTzvR5TcpbTGXn1KypUxqZrxcg7cH79Q+OquUO0DP/P2W0SktR9U6klIe/FiE0a
-i0jKRSD+kVbc9Y6S3xxXnuEewj2JDo4DA+og+ALyYB1D4AvTRCSODO2/Q/W9SWuR
-C3Kk8j0vjsw9VH7e/hqWQU5dh5+EWzySjKdz5ABqEwJE162JMVDu0uyvbkfkm1k9
-k1jVcR5k96xohcqG92olsP9Wd6/0UENJCyIxa3lv8nTffBvhTRLnuh5lOK0nODtQ
-bdDmNg65JSfYMeQuvgG02P5w0hL/u3s/9NxRgxczjiZo0Yk+5WcAcuAPkoO6YlXb
-roR9Xsx/ctDc84ieIgd4muFO4zQwFFb7gJPyvsPNcBv+sNpBPCifqA4ceRtSmqio
-zw4W+cDbmenfSsNmfE+hJ+vwBl5NQQKBwQD3QauloSM35r7+hemWMBvEM1DIhV5E
-RlEdPSiKIVgtO4IR3LwNdsUgRaI0ycuFO952BrzBn005w2OtXQ3+vKs/LHZnKdml
-PTivown/CezpFYUE5nCHLu6geCZzoHRgGK33jBrzTAdTubidptE/i6MThxagQBE2
-m/Qesbq5ADQV0ikN6JD3xdzBk9PlbmwTJA8Ryw036vn5iY6RcU8dWxf4qpSNQ7+s
-3dbsPLxw0VETdnfvmpFtTVky5peT2LsUYP0CgcEAwIl5qHOGIMfpDTVWpNCoNyF2
-Jekvn8DmRfYnVFZK3Q7FQ+TsxSCXFlv874ZXsebOi+lY1KTDoG32V22KCevR3mNC
-gXafTED3SNOZGyN9645Se+iUlPPVSUlu2jjC9rYOJ3r5TStsqqDex7F4Bu58X34z
-bQVEm5rKkBJhpJZGm2bRi0zp8SEvbCaqT1Y91wOMvzMkpQH1h6Oy2SuCK0LEWl1A
-hNLYfSlvaSGiC8p8RjS3jykRL2I+h6BiUDQhiUoJAoHBAMuyL12RRbldAIYg/lH7
-qjRV7jx0Gzf2EgcbhlVdqQ4Ck2Jxzf7tlPLESyBgCqnlq5ziagi9W1q2DF0bZ1cw
-SYgO8jCFOse1iwivMaIJpEJVtzNVQOktketjcJIbYyRz0IY6x00emn6wZ1aBwqsu
-N5fz14EHpuatTk0nMGQOtdowPCA4M43cVMSpK409Dg4qy7tl46roiy231Fsf1QSj
-MjlrFlzWrocUb2ZJlxj+aGO3WpFrbll0uoKDk+Z6S407ZQKBwBd2KR7/xM5lzd5Q
-K5i13GmraCxCeA0tgmHwFubOBR1e2WbmlHuI9yBAYVgGtNT23SBrdOmkkjoQbD5H
-GNUQqWhCDC6ed9bg68EyF6wY7RUxKJf0xXZJKCpgCmQJGqjZkmv5LjvbGMjKBZur
-4oZltT4lsLqOM8gKWrinpMJblYsGQm6JFtDNTGwPYh180thKlHIQF10MGhFHP1n7
-VUdUQX0Jc/07fCn0TKEw+gAZ0n7zmZKWXIO7owb/4jsHvzZtkQKBwAt9Mb+1iQrI
-LChMQZjub1XladOyHGbE2h15LYsDKDCjyW9+lKJyds4aMifG+Xiu19DYr6F2VP8r
-l6Rdter2pbMIoZxGfH2AODKp5Al9sOQf4ujg74T0B45MvAJyrUPmx1rnd9GBJ46m
-uyPdFGnLCAJol7j/f8BPQ4bR2I5+mq4dxe6uGQPZy/ExtXtybMv40cEHmuUJjyp6
-kkvpHqB9qq69h2C+d7er3slUE+lqPILLlOJMvDU2EtYP4XdY/whOOA==
------END RSA PRIVATE KEY-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem b/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem
deleted file mode 100644
index 8dea291608fb129c61a7f2079e71860d272416c5..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEJDCCAoygAwIBAgIMWVIdaS9ZbFWnhzweMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNjI3MDg1NTA1WhcNMjcwNjI1MDg1
-NTA1WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBMREFQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALf2/pDGjImrdYxtnFCQMzBpS7kpqDybB2ThvdWf3zgfVDdZ
-4fMt9l0/9YnUwjbEaG4/xhzTS5CUvvkSVssgtkv3h59Q9DeC77LL+CxUWAPTsqEf
-KGtVS4MvMrHi95h17lPdQQIu1mhE7lSJddRx4kMiPNm0mdRcfRtUUNuUW4PORQ7x
-7RcP8Tw39CTIJiaA1EK4PjxY4ZkGoopD4ShxpGdc/37hqosepU3Kexm/3hhacPOJ
-AVZjCdwvc4vwk0yKY5cX4KV9Su4SWLzctmZRPIpyBwlMT7pwU/FQZANgE3IjKziK
-kAjRCjC8daghq2IPSD1wYNXaUuV7K8yMAKkoBUkCAwEAAaOBjzCBjDAMBgNVHRMB
-Af8EAjAAMBYGA1UdEQQPMA2CC2xkYXAtc2VydmVyMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFKOBucctLQCRMaZNo+XT4dRL
-MOzpMB8GA1UdIwQYMBaAFDdr25McaX6STGvfc4X4hJZZgU9rMA0GCSqGSIb3DQEB
-CwUAA4IBgQBSV2tOZjFJNKuBiHvGBbtIWGGzXADbn5CsOMOcjC6T3nCY06H6WaEF
-znaiH2CY/GkHIk8GT86QcmEaGFuLimG80oszfFBh2C/m/H+U4uN914+Qvj9GedX1
-NpzgBzZuPCOqcov0omLz4CUCr+2bEnk3TRtvHbtl22VEIAIYFfAgXe8mD4eD5qV5
-bBrk2rgImEZicM/8FvnvLIREeWvlmzXo9dkixZflFRNUIulXEuiWG8gxv8Aqwb++
-UFU4pg/kx0cgsBdXkwtz0a8WXUvs+SfrmF7xX3my7PqfKdW/h57LcTAdQ5cbUvZ+
-Ob3UqZJJmnc/7UPa2bxbQXORJTjWZT0uI8hMcqq0Es0RKBgNo8gYwu7qcY/G1BZ6
-7DTD8tVenTE2661ubj7X0uIP0nt+HMBt0yDhPibuhgEtUjAi0ManTpM1Y6ZcQRYD
-YJVyjcmzsTIjmcJY/FBOvnefhvoI9dOLwkjjpp7gd8HGI4ajyjvJ//c8uPPwgyZ/
-3XDuA5ZWtSk=
------END CERTIFICATE-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem b/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem
deleted file mode 100644
index 263d416f37d57863093d46218bcb23dd5ecc6f97..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/ldap-server_ldap.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:b7:f6:fe:90:c6:8c:89:ab:75:8c:6d:9c:50:90:33
-	30:69:4b:b9:29:a8:3c:9b:07:64:e1:bd:d5:9f:df:38
-	1f:54:37:59:e1:f3:2d:f6:5d:3f:f5:89:d4:c2:36:c4
-	68:6e:3f:c6:1c:d3:4b:90:94:be:f9:12:56:cb:20:b6
-	4b:f7:87:9f:50:f4:37:82:ef:b2:cb:f8:2c:54:58:03
-	d3:b2:a1:1f:28:6b:55:4b:83:2f:32:b1:e2:f7:98:75
-	ee:53:dd:41:02:2e:d6:68:44:ee:54:89:75:d4:71:e2
-	43:22:3c:d9:b4:99:d4:5c:7d:1b:54:50:db:94:5b:83
-	ce:45:0e:f1:ed:17:0f:f1:3c:37:f4:24:c8:26:26:80
-	d4:42:b8:3e:3c:58:e1:99:06:a2:8a:43:e1:28:71:a4
-	67:5c:ff:7e:e1:aa:8b:1e:a5:4d:ca:7b:19:bf:de:18
-	5a:70:f3:89:01:56:63:09:dc:2f:73:8b:f0:93:4c:8a
-	63:97:17:e0:a5:7d:4a:ee:12:58:bc:dc:b6:66:51:3c
-	8a:72:07:09:4c:4f:ba:70:53:f1:50:64:03:60:13:72
-	23:2b:38:8a:90:08:d1:0a:30:bc:75:a8:21:ab:62:0f
-	48:3d:70:60:d5:da:52:e5:7b:2b:cc:8c:00:a9:28:05
-	49:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	5b:c4:86:30:4a:1b:09:01:d2:dd:7e:40:1f:a0:0f:28
-	f3:1d:a6:fc:34:c4:26:c1:85:7d:66:69:0e:1b:17:af
-	e9:1e:c3:63:87:1f:42:6a:39:e1:8e:23:e7:cd:d2:24
-	15:fb:12:24:86:f2:86:e8:ec:6a:ea:cf:08:fd:04:72
-	d8:c3:7a:a1:b3:71:8d:8b:6c:b1:7a:d7:02:2b:f5:9c
-	c0:da:c6:e4:2e:c6:99:a8:92:fe:c2:e5:e9:84:d0:2f
-	56:fe:63:d3:66:f1:e5:89:9d:29:e6:78:34:c5:aa:8c
-	ba:a3:88:26:23:26:60:0c:b8:79:52:ec:76:11:40:a9
-	e7:7f:bc:43:b3:99:80:be:17:6e:47:df:3b:59:29:7a
-	d0:3b:89:f8:8e:44:ff:e5:f1:d4:fc:50:26:be:17:2c
-	a6:5b:fd:95:11:34:36:18:e2:ff:5b:96:3e:cf:88:f1
-	fb:9f:cb:8f:3d:59:d8:d1:4e:39:9e:1f:76:d6:8a:31
-	a6:56:04:de:01:3e:a1:9e:92:4a:74:63:90:da:07:1e
-	61:ec:07:34:6a:b3:6a:b8:f1:90:7c:f2:57:b9:fa:94
-	7b:cc:2b:2e:1c:1c:68:33:ea:d0:d2:36:23:1e:52:f3
-	5e:54:5c:dd:69:6d:b3:83:3a:b1:0e:da:92:9e:93:41
-	
-
-prime1:
-	00:ea:10:f1:bb:3c:a9:d1:07:b0:6b:6e:e6:b4:73:f8
-	a3:56:49:43:56:4b:93:21:58:ac:bd:7d:d1:40:15:44
-	c7:a5:be:8f:c1:73:bb:6c:80:6f:84:5a:02:a5:5e:92
-	b3:ce:cc:2e:16:8a:29:c7:d2:e0:e9:0b:c1:c5:8a:1c
-	b9:c4:ce:8f:df:58:4f:c2:5d:44:53:05:40:eb:dc:80
-	17:79:3d:55:ad:a5:9b:c0:a9:6e:f1:9a:2c:71:15:73
-	8f:01:fd:4b:71:ec:b5:7b:5e:7e:d2:f7:a8:53:e8:ab
-	ec:f8:c4:2b:3a:12:87:fc:a7:73:0d:9f:e2:91:a9:25
-	6d:
-
-prime2:
-	00:c9:34:28:d3:1a:69:b9:a8:74:04:60:b3:d8:2e:98
-	32:79:ee:4a:14:e0:a0:d4:3f:08:7a:00:a0:68:0b:b3
-	e4:44:e3:bf:ea:11:16:bd:b9:8c:5d:01:81:24:a9:ff
-	5b:dc:9e:83:4c:b4:89:05:0e:cb:b6:f9:e4:e7:f5:fa
-	34:e3:cc:60:2f:3f:29:71:74:16:00:bb:b0:f3:49:4a
-	b6:9e:df:7e:4e:1e:7c:1c:4a:48:a9:a9:45:ef:8d:af
-	48:27:58:d2:b9:31:9b:4a:08:bf:f6:98:3d:09:01:e0
-	42:0b:22:95:81:2b:67:d4:1d:90:2e:43:22:7f:2a:21
-	cd:
-
-coefficient:
-	00:c8:92:b0:f4:93:ba:ba:0b:4d:a0:01:30:aa:09:b1
-	3f:6b:2d:a1:ed:48:8e:fe:d7:14:62:4c:7b:d8:d2:b9
-	2d:3b:80:c5:2c:25:94:c0:7c:d0:7c:0d:48:aa:39:48
-	6c:ba:3f:e3:23:65:af:43:0e:65:76:b8:7e:b2:7f:e1
-	52:29:9b:49:bb:7a:18:80:43:40:a7:d4:79:0b:d5:c8
-	b3:c9:95:ac:72:2f:3f:d2:87:5f:e1:90:e2:4d:e3:c5
-	dc:a9:69:7b:f3:54:cc:6d:38:c0:5f:29:fc:fc:ce:2e
-	a0:30:ba:5c:73:3c:10:4e:d9:27:b2:35:79:37:ac:75
-	19:
-
-exp1:
-	25:e7:8a:8d:ec:bb:ff:5a:c4:6a:11:72:90:e4:7a:ee
-	50:89:da:ba:bd:d0:5c:c5:14:6c:37:54:cc:90:e5:2b
-	83:9e:c1:7e:ed:73:fb:95:2c:f9:fc:ed:92:c4:26:f3
-	b1:58:85:5a:27:13:af:05:6a:60:b3:03:b5:2e:b1:8a
-	2f:e1:d7:90:ae:a7:73:ed:50:a4:35:24:97:4d:84:fc
-	c8:28:73:98:84:4a:1d:c0:12:74:53:a8:40:c3:dd:8b
-	da:21:9f:b7:1a:43:25:70:5f:0f:61:05:c4:58:d8:86
-	ae:9e:6d:f5:a0:8c:9f:10:aa:e4:18:f1:42:ef:66:5d
-	
-
-exp2:
-	00:bb:3d:b4:24:48:b7:4d:14:8b:eb:2b:07:12:ce:c1
-	ca:6f:98:27:0e:e8:c0:22:e5:0a:01:67:a5:df:4d:cc
-	ba:48:b5:dd:fa:78:ae:be:1e:f7:95:f1:f9:79:e2:4e
-	06:f1:f7:fd:de:9b:3f:cc:1a:29:d0:7d:1b:de:16:16
-	23:b4:3e:94:e0:43:1a:51:3f:a3:de:48:cc:f2:8b:29
-	61:6b:d6:36:d7:82:1d:23:c2:a9:7e:62:4d:f8:11:d5
-	a6:03:1f:f0:f2:71:4c:bf:88:07:04:f8:46:0c:a4:d7
-	4a:fe:cb:cf:6f:e6:b1:f8:3f:0e:d7:4e:98:c2:d8:b5
-	9d:
-
-
-Public Key PIN:
-	pin-sha256:WjLH/W6cJM/BtbWZYQxkam+GXvyZCVqiv57MYnFau4M=
-Public Key ID:
-	sha256:5a32c7fd6e9c24cfc1b5b599610c646a6f865efc99095aa2bf9ecc62715abb83
-	sha1:a381b9c72d2d009131a64da3e5d3e1d44b30ece9
-
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAt/b+kMaMiat1jG2cUJAzMGlLuSmoPJsHZOG91Z/fOB9UN1nh
-8y32XT/1idTCNsRobj/GHNNLkJS++RJWyyC2S/eHn1D0N4Lvssv4LFRYA9OyoR8o
-a1VLgy8yseL3mHXuU91BAi7WaETuVIl11HHiQyI82bSZ1Fx9G1RQ25Rbg85FDvHt
-Fw/xPDf0JMgmJoDUQrg+PFjhmQaiikPhKHGkZ1z/fuGqix6lTcp7Gb/eGFpw84kB
-VmMJ3C9zi/CTTIpjlxfgpX1K7hJYvNy2ZlE8inIHCUxPunBT8VBkA2ATciMrOIqQ
-CNEKMLx1qCGrYg9IPXBg1dpS5XsrzIwAqSgFSQIDAQABAoIBAFvEhjBKGwkB0t1+
-QB+gDyjzHab8NMQmwYV9ZmkOGxev6R7DY4cfQmo54Y4j583SJBX7EiSG8obo7Grq
-zwj9BHLYw3qhs3GNi2yxetcCK/WcwNrG5C7GmaiS/sLl6YTQL1b+Y9Nm8eWJnSnm
-eDTFqoy6o4gmIyZgDLh5Uux2EUCp53+8Q7OZgL4XbkffO1kpetA7ifiORP/l8dT8
-UCa+FyymW/2VETQ2GOL/W5Y+z4jx+5/Ljz1Z2NFOOZ4fdtaKMaZWBN4BPqGekkp0
-Y5DaBx5h7Ac0arNquPGQfPJXufqUe8wrLhwcaDPq0NI2Ix5S815UXN1pbbODOrEO
-2pKek0ECgYEA6hDxuzyp0Qewa27mtHP4o1ZJQ1ZLkyFYrL190UAVRMelvo/Bc7ts
-gG+EWgKlXpKzzswuFoopx9Lg6QvBxYocucTOj99YT8JdRFMFQOvcgBd5PVWtpZvA
-qW7xmixxFXOPAf1Lcey1e15+0veoU+ir7PjEKzoSh/yncw2f4pGpJW0CgYEAyTQo
-0xppuah0BGCz2C6YMnnuShTgoNQ/CHoAoGgLs+RE47/qERa9uYxdAYEkqf9b3J6D
-TLSJBQ7Ltvnk5/X6NOPMYC8/KXF0FgC7sPNJSrae335OHnwcSkipqUXvja9IJ1jS
-uTGbSgi/9pg9CQHgQgsilYErZ9QdkC5DIn8qIc0CgYAl54qN7Lv/WsRqEXKQ5Hru
-UInaur3QXMUUbDdUzJDlK4OewX7tc/uVLPn87ZLEJvOxWIVaJxOvBWpgswO1LrGK
-L+HXkK6nc+1QpDUkl02E/Mgoc5iESh3AEnRTqEDD3YvaIZ+3GkMlcF8PYQXEWNiG
-rp5t9aCMnxCq5BjxQu9mXQKBgQC7PbQkSLdNFIvrKwcSzsHKb5gnDujAIuUKAWel
-303Muki13fp4rr4e95Xx+XniTgbx9/3emz/MGinQfRveFhYjtD6U4EMaUT+j3kjM
-8ospYWvWNteCHSPCqX5iTfgR1aYDH/DycUy/iAcE+EYMpNdK/svPb+ax+D8O106Y
-wti1nQKBgQDIkrD0k7q6C02gATCqCbE/ay2h7UiO/tcUYkx72NK5LTuAxSwllMB8
-0HwNSKo5SGy6P+MjZa9DDmV2uH6yf+FSKZtJu3oYgENAp9R5C9XIs8mVrHIvP9KH
-X+GQ4k3jxdypaXvzVMxtOMBfKfz8zi6gMLpcczwQTtknsjV5N6x1GQ==
------END RSA PRIVATE KEY-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.cert.pem b/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.cert.pem
deleted file mode 100644
index 20f0ffbab45dfecd7c291ddd103b739d0a59a4dd..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIENjCCAp6gAwIBAgIMWWSpYRreX/eZfcxHMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNzExMTAzMzA1WhcNMjcwNzA5MTAz
-MzA1WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBYTVBQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMs6M+LgA/VKzaMYtB5SauE9kCwL4f2irBzI9lCLQ67Rf6vV
-F5OikX1cEHJn4HEkhvbeujDtkw3iukA2TDeZw5FB0L8cRbpSsHIuWjliB7Hy7nEP
-wfAdcqfblp0fOjNQavEzwYh9rg2s3Qaxvgk7UCa4LBS6Gx8EcJ1fYpcjqNjYHZ+G
-9653nIJf1weBd/qAX4xNUcIdx46kmF//MfkCbmKAAhRd9p1U98Wc26a3guBnZGlQ
-y9vJbMcvHr7q/cKzi2yoiIiQggekPgnQZNpTy8kOV8h3+q2qSy9kmWOz6uQxGKhi
-1sj4PjRvepqlZIOuGmns52qhOt0D3wcOVim9g60CAwEAAaOBoTCBnjAMBgNVHRMB
-Af8EAjAAMCgGA1UdEQQhMB+CFHBhcmFtZXRlcnMtbWFuZGF0b3J5ggdkb21haW4x
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYE
-FNEuWaIoIHZujkn6OA5uk2f9XDf3MB8GA1UdIwQYMBaAFDdr25McaX6STGvfc4X4
-hJZZgU9rMA0GCSqGSIb3DQEBCwUAA4IBgQBshtMmQRwArDdUaOouK+WVRSVcZvl9
-Sz2+PhSNmGffeF8P43q0WhFCYBb2+9HL+NVfzonPqaPswjqWSIj6vrBhNKQFI1+q
-ZHkZvzRWJcgCBNSS5hR1rKZRjSE+mcJVcj5+FjbwMbCuUx3CVd80kQWimvvlrQOR
-QstDJDqKX6WyODQpukBGw1mCHeHR2L6mOzbQ8GaSYqXP5TDXrhKBGq5xLVQg2FMw
-VkwWBnytLa4W9ej36oJRpzqzzapPWifp5X/ze6KXHOvrrI/NKfDlbdpw5N9HlJ9K
-M42e3HWMnQo75SkAMhA8UVisDGgBLiWfrMhcnk9SPIx83NPj4AkP5fbAa1LceHG7
-SC7VnAe02B44zm4oMockvhKGBGJDFa/bWM2szNvgrjwhf0lpxBVmxQqeE5OrgIw5
-kw/vbN7/gVWJbbfFZ16n8nVst8Xuow56OfgjcdIdp7Z2nVQVqe5qALrZKUZ94nLd
-zm8QHU0XkNQsGEnZdeDHVpzAqj9olzTxlBY=
------END CERTIFICATE-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.key.pem b/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.key.pem
deleted file mode 100644
index f2da4f4baf2f10e7607693305128eb384451d7c1..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64.domain1_xmpp.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:cb:3a:33:e2:e0:03:f5:4a:cd:a3:18:b4:1e:52:6a
-	e1:3d:90:2c:0b:e1:fd:a2:ac:1c:c8:f6:50:8b:43:ae
-	d1:7f:ab:d5:17:93:a2:91:7d:5c:10:72:67:e0:71:24
-	86:f6:de:ba:30:ed:93:0d:e2:ba:40:36:4c:37:99:c3
-	91:41:d0:bf:1c:45:ba:52:b0:72:2e:5a:39:62:07:b1
-	f2:ee:71:0f:c1:f0:1d:72:a7:db:96:9d:1f:3a:33:50
-	6a:f1:33:c1:88:7d:ae:0d:ac:dd:06:b1:be:09:3b:50
-	26:b8:2c:14:ba:1b:1f:04:70:9d:5f:62:97:23:a8:d8
-	d8:1d:9f:86:f7:ae:77:9c:82:5f:d7:07:81:77:fa:80
-	5f:8c:4d:51:c2:1d:c7:8e:a4:98:5f:ff:31:f9:02:6e
-	62:80:02:14:5d:f6:9d:54:f7:c5:9c:db:a6:b7:82:e0
-	67:64:69:50:cb:db:c9:6c:c7:2f:1e:be:ea:fd:c2:b3
-	8b:6c:a8:88:88:90:82:07:a4:3e:09:d0:64:da:53:cb
-	c9:0e:57:c8:77:fa:ad:aa:4b:2f:64:99:63:b3:ea:e4
-	31:18:a8:62:d6:c8:f8:3e:34:6f:7a:9a:a5:64:83:ae
-	1a:69:ec:e7:6a:a1:3a:dd:03:df:07:0e:56:29:bd:83
-	ad:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	31:3b:df:78:16:37:3f:44:a8:fe:db:2c:3f:b0:4d:ce
-	55:80:c8:fa:f3:fb:e3:5d:f8:f7:42:9d:0e:b0:0d:f9
-	19:0a:02:ec:dc:4a:65:1e:ce:9f:f9:67:6a:fb:5e:13
-	08:59:bb:17:c1:66:7f:d5:ae:b3:81:b4:03:40:50:1d
-	af:a9:27:b3:6c:bd:0f:ed:49:2c:2b:95:7d:47:49:f8
-	05:86:04:80:42:70:8f:e7:54:8e:6f:70:32:44:5e:36
-	1a:4b:24:96:b1:83:ea:32:37:b5:b8:77:c6:7a:c5:17
-	2c:45:19:9c:60:97:aa:16:b2:39:7a:84:0d:12:89:bd
-	9b:0a:d2:9d:03:13:1c:88:01:c4:b2:d5:e3:63:e5:fd
-	68:c4:0f:76:e8:da:a8:e9:12:c4:2f:f4:14:7e:73:7f
-	4c:9b:5c:30:c2:8e:7a:7d:b8:ab:12:49:fb:f3:27:60
-	c0:74:36:ac:b8:08:e6:d7:44:66:f8:06:c9:75:c9:db
-	54:1c:8c:09:87:bf:d0:90:cf:45:55:52:bf:f7:7f:83
-	53:43:5a:b4:e7:98:02:3f:30:be:3a:e7:17:a4:af:d3
-	a4:08:aa:db:d8:fd:c9:6d:40:99:9f:2a:f5:08:97:17
-	32:17:5a:e6:20:1c:d3:c4:2a:ad:6d:0e:9c:04:38:41
-	
-
-prime1:
-	00:ed:c3:c1:34:90:09:ae:d5:20:0a:8d:eb:4e:97:b8
-	f3:33:9d:16:23:4c:59:f7:07:67:fe:c9:a7:06:72:83
-	78:a8:59:3f:68:66:0e:be:21:dd:25:1a:c3:4d:6b:c1
-	20:49:68:84:ee:8e:9c:ec:36:6f:d9:15:89:c1:4b:2f
-	32:67:a5:ca:9a:6b:0d:28:6f:34:dc:68:9c:d4:8e:79
-	eb:d8:b5:8d:5d:81:f4:38:0e:0d:c0:6d:e2:bc:8e:0f
-	e1:70:2c:e7:d1:66:06:ca:ab:7e:70:67:e4:85:89:53
-	2c:85:1d:85:a2:5e:e0:03:87:21:ec:fa:f5:41:2f:40
-	31:
-
-prime2:
-	00:da:d0:58:9f:2f:00:ba:2c:c8:eb:ec:4c:8d:5b:99
-	03:76:cc:e5:c6:e5:a7:8b:a7:83:76:56:07:39:45:f5
-	0b:16:9c:e7:46:2c:22:17:21:72:3b:f3:4e:9a:44:37
-	30:eb:f0:17:00:cf:a3:8c:1f:a2:3a:a4:5e:84:ff:ce
-	c2:04:ee:9d:e8:26:d2:4e:1d:20:6d:01:3b:4d:db:62
-	bf:ac:8d:93:9a:85:ee:6a:7e:ff:77:c5:31:2d:17:57
-	f9:5d:6f:be:79:b0:e4:6a:9a:04:32:76:a8:7d:04:1f
-	d2:83:2b:b1:16:96:d4:3b:8d:a1:22:24:57:22:d8:b8
-	3d:
-
-coefficient:
-	30:7f:c6:82:a7:bd:58:f8:b4:d2:b8:64:93:df:76:d9
-	c4:8e:d5:41:b6:6c:06:12:e8:08:de:9b:21:ce:d4:02
-	35:29:06:0f:b5:41:da:ad:b4:39:bf:4e:b9:47:06:7b
-	4d:ac:c0:f8:5b:ff:a4:11:62:30:5d:3a:76:ee:3c:e6
-	aa:87:11:a6:2b:41:e3:f3:37:8b:89:3b:65:30:2b:0e
-	79:fe:7e:6f:5d:c7:a7:db:89:14:4d:fd:b0:90:a4:71
-	af:5a:6c:5a:6e:1e:1d:0e:95:c2:c0:40:47:bc:c0:41
-	f3:93:cd:8f:08:4e:96:49:a3:6d:0d:d0:a9:58:18:21
-	
-
-exp1:
-	68:c8:46:53:35:cf:2e:9f:7a:39:6c:85:f0:e2:e8:7d
-	35:97:da:f3:bf:68:3e:77:a3:1b:24:1f:59:b6:09:be
-	98:e2:8c:11:24:39:07:0d:c1:79:e2:ab:83:69:23:79
-	69:20:88:c4:e1:50:c2:c0:d2:d5:e6:aa:08:e7:6b:6b
-	59:46:35:5d:8c:24:06:57:cc:01:fe:90:6f:14:43:22
-	ef:24:43:a2:9b:ec:d6:ef:4a:9c:2d:51:29:2b:aa:4f
-	fd:b1:ac:90:19:d8:90:64:b7:9a:2e:0f:05:d2:99:37
-	1b:8b:01:23:a7:90:2d:bd:d5:f3:ac:3d:7d:76:a7:61
-	
-
-exp2:
-	19:11:4d:55:cf:38:b2:1b:77:59:2f:d5:05:4c:bd:16
-	dc:81:54:c1:98:85:bd:46:0f:95:7a:fd:90:de:26:d8
-	82:5a:af:54:26:b2:31:1c:2f:ce:16:6d:a6:d6:b1:cb
-	f4:fb:a8:66:fb:62:ad:26:e2:9a:fd:41:a6:d2:f7:88
-	da:af:cb:7f:51:13:3e:c7:af:73:4d:74:d1:d2:94:59
-	89:17:1f:15:d0:ca:23:81:31:1b:33:88:12:b6:5d:e9
-	bf:7e:91:bf:b7:38:33:ce:39:34:de:cb:26:a7:56:4d
-	f3:a1:09:c4:a0:ba:e7:a7:ae:12:0f:3f:bc:4a:3f:b1
-	
-
-
-Public Key PIN:
-	pin-sha256:soVlq2xfLjafw5ZjlJCZFSns2WrcPBaR+BnM7V2C0TQ=
-Public Key ID:
-	sha256:b28565ab6c5f2e369fc396639490991529ecd96adc3c1691f819cced5d82d134
-	sha1:d12e59a22820766e8e49fa380e6e9367fd5c37f7
-
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAyzoz4uAD9UrNoxi0HlJq4T2QLAvh/aKsHMj2UItDrtF/q9UX
-k6KRfVwQcmfgcSSG9t66MO2TDeK6QDZMN5nDkUHQvxxFulKwci5aOWIHsfLucQ/B
-8B1yp9uWnR86M1Bq8TPBiH2uDazdBrG+CTtQJrgsFLobHwRwnV9ilyOo2Ngdn4b3
-rnecgl/XB4F3+oBfjE1Rwh3HjqSYX/8x+QJuYoACFF32nVT3xZzbpreC4GdkaVDL
-28lsxy8evur9wrOLbKiIiJCCB6Q+CdBk2lPLyQ5XyHf6rapLL2SZY7Pq5DEYqGLW
-yPg+NG96mqVkg64aaeznaqE63QPfBw5WKb2DrQIDAQABAoIBADE733gWNz9EqP7b
-LD+wTc5VgMj68/vjXfj3Qp0OsA35GQoC7NxKZR7On/lnavteEwhZuxfBZn/VrrOB
-tANAUB2vqSezbL0P7UksK5V9R0n4BYYEgEJwj+dUjm9wMkReNhpLJJaxg+oyN7W4
-d8Z6xRcsRRmcYJeqFrI5eoQNEom9mwrSnQMTHIgBxLLV42Pl/WjED3bo2qjpEsQv
-9BR+c39Mm1wwwo56fbirEkn78ydgwHQ2rLgI5tdEZvgGyXXJ21QcjAmHv9CQz0VV
-Ur/3f4NTQ1q055gCPzC+OucXpK/TpAiq29j9yW1AmZ8q9QiXFzIXWuYgHNPEKq1t
-DpwEOEECgYEA7cPBNJAJrtUgCo3rTpe48zOdFiNMWfcHZ/7JpwZyg3ioWT9oZg6+
-Id0lGsNNa8EgSWiE7o6c7DZv2RWJwUsvMmelypprDShvNNxonNSOeevYtY1dgfQ4
-Dg3AbeK8jg/hcCzn0WYGyqt+cGfkhYlTLIUdhaJe4AOHIez69UEvQDECgYEA2tBY
-ny8AuizI6+xMjVuZA3bM5cblp4ung3ZWBzlF9QsWnOdGLCIXIXI7806aRDcw6/AX
-AM+jjB+iOqRehP/OwgTunegm0k4dIG0BO03bYr+sjZOahe5qfv93xTEtF1f5XW++
-ebDkapoEMnaofQQf0oMrsRaW1DuNoSIkVyLYuD0CgYBoyEZTNc8un3o5bIXw4uh9
-NZfa879oPnejGyQfWbYJvpjijBEkOQcNwXniq4NpI3lpIIjE4VDCwNLV5qoI52tr
-WUY1XYwkBlfMAf6QbxRDIu8kQ6Kb7NbvSpwtUSkrqk/9sayQGdiQZLeaLg8F0pk3
-G4sBI6eQLb3V86w9fXanYQKBgBkRTVXPOLIbd1kv1QVMvRbcgVTBmIW9Rg+Vev2Q
-3ibYglqvVCayMRwvzhZtptaxy/T7qGb7Yq0m4pr9QabS94jar8t/URM+x69zTXTR
-0pRZiRcfFdDKI4ExGzOIErZd6b9+kb+3ODPOOTTeyyanVk3zoQnEoLrnp64SDz+8
-Sj+xAoGAMH/Ggqe9WPi00rhkk9922cSO1UG2bAYS6AjemyHO1AI1KQYPtUHarbQ5
-v065RwZ7TazA+Fv/pBFiMF06du485qqHEaYrQePzN4uJO2UwKw55/n5vXcen24kU
-Tf2wkKRxr1psWm4eHQ6VwsBAR7zAQfOTzY8ITpZJo20N0KlYGCE=
------END RSA PRIVATE KEY-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.cert.pem b/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.cert.pem
deleted file mode 100644
index 2a9aeb74b2b9d618c1126c0de7b219c435997385..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.cert.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEPjCCAqagAwIBAgIMWWSpYiCZM+MtIe1dMA0GCSqGSIb3DQEBCwUAMEgxIjAg
-BgNVBAMTGUV4YW1wbGUgSW5jLiBUZXN0IFNpdGUgQ0ExFTATBgNVBAoTDEV4YW1w
-bGUgSW5jLjELMAkGA1UEBhMCU0UwHhcNMTcwNzExMTAzMzA2WhcNMjcwNzA5MTAz
-MzA2WjBGMSAwHgYDVQQDExdFeGFtcGUgSW5jLiBYTVBQIFNlcnZlcjEVMBMGA1UE
-ChMMRXhhbXBsZSBJbmMuMQswCQYDVQQGEwJTRTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANguIsJSfq7UIXTjJyfbHxMI5TKSstBAAZ0oAI2TacWRl7v0
-V9bMEoa/6++A/Ikx+i/mdG/QuYyAPJStqSqQZqtQqS/JpwfQVhREvVsDd+eUN1yz
-7RpuDzmAgDfNrUKjoSjcPuYBBXboRYF+zpPSBS1UAj4rTx82aXoM8c/hEMEQJhqH
-YQEX3jSdOSa44iPliSrrBecmtz1cpfmcsVr2cnnLl7T+6X2uAf1xqwae8kZPIDJT
-hOhLxtjgzcK4GiRhmo6IDbgZEZJYL9klodLsNUMpwnz8x7YDNvfTLp4A+6tTIt7r
-tAP7IY6H8aqSEB7UROQzlwlcq+QTUyX3jC3PhD8CAwEAAaOBqTCBpjAMBgNVHRMB
-Af8EAjAAMDAGA1UdEQQpMCeCE3BhcmFtZXRlcnMtb3B0aW9uYWyCB2RvbWFpbjKC
-B2RvbWFpbjMwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0PAQH/BAUDAwegADAd
-BgNVHQ4EFgQUpGYgMrorqVDa/I+qLXQV1ofeEoQwHwYDVR0jBBgwFoAUN2vbkxxp
-fpJMa99zhfiEllmBT2swDQYJKoZIhvcNAQELBQADggGBACq4UBLcf0838pCeBbK1
-SXYx0/LtqjOpuOElcLP+X8HE4cgVse5HHApyhXerl8x8NTP8J2U2aH+XcgGk+TNU
-Rzz7NRjQ0ojDa2eiGzQNM6bl9eb6+NLL6v8jdaZmGdGBvs6A3tyKzBe2N9rlPvJy
-cHdSLNRoUGrRez6HmbAellu3x7tRtD1ZM0G3WXI0FtBlMGBAquUgTm7IeDVGbtIj
-me8lzLJh1heK0uw9Z3YYh2zsabmQ8xpiKYzthV9YvpXYOcRpIEj1EhbCEKAvaWu9
-cxSwzn/dIv4lz3kd2RMUHU0KCT1dJA0DjSurj1bhe5l/MDkWfilo70PpAyEn6aoO
-++ayoCJd7qJBmpJ2/BBOYDvANbyDVSsIQJEkQrxdlWXmsu4QFPDyinxIYdjC0Npp
-iRrV5PFPWGoowWFmrX+g2xJBA8vkeSsyQe0ev8bHQ68/ldHqtY6aqPS7rjn4jgsY
-6ngNP9xRw2kaj2vpUAZbUH7GxNekWSDdt0s5AWz3z0fQyg==
------END CERTIFICATE-----
diff --git a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.key.pem b/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.key.pem
deleted file mode 100644
index 7a29bbb8b4c3e94d2f31462164d2c1fa373471d5..0000000000000000000000000000000000000000
--- a/roles/xmpp_server/molecule/default/tests/data/x509/parameters-optional-stretch64_xmpp.key.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-Public Key Info:
-	Public Key Algorithm: RSA
-	Key Security Level: Medium (2048 bits)
-
-modulus:
-	00:d8:2e:22:c2:52:7e:ae:d4:21:74:e3:27:27:db:1f
-	13:08:e5:32:92:b2:d0:40:01:9d:28:00:8d:93:69:c5
-	91:97:bb:f4:57:d6:cc:12:86:bf:eb:ef:80:fc:89:31
-	fa:2f:e6:74:6f:d0:b9:8c:80:3c:94:ad:a9:2a:90:66
-	ab:50:a9:2f:c9:a7:07:d0:56:14:44:bd:5b:03:77:e7
-	94:37:5c:b3:ed:1a:6e:0f:39:80:80:37:cd:ad:42:a3
-	a1:28:dc:3e:e6:01:05:76:e8:45:81:7e:ce:93:d2:05
-	2d:54:02:3e:2b:4f:1f:36:69:7a:0c:f1:cf:e1:10:c1
-	10:26:1a:87:61:01:17:de:34:9d:39:26:b8:e2:23:e5
-	89:2a:eb:05:e7:26:b7:3d:5c:a5:f9:9c:b1:5a:f6:72
-	79:cb:97:b4:fe:e9:7d:ae:01:fd:71:ab:06:9e:f2:46
-	4f:20:32:53:84:e8:4b:c6:d8:e0:cd:c2:b8:1a:24:61
-	9a:8e:88:0d:b8:19:11:92:58:2f:d9:25:a1:d2:ec:35
-	43:29:c2:7c:fc:c7:b6:03:36:f7:d3:2e:9e:00:fb:ab
-	53:22:de:eb:b4:03:fb:21:8e:87:f1:aa:92:10:1e:d4
-	44:e4:33:97:09:5c:ab:e4:13:53:25:f7:8c:2d:cf:84
-	3f:
-
-public exponent:
-	01:00:01:
-
-private exponent:
-	00:89:73:04:0c:b3:b0:f2:6d:d3:fb:e2:b5:b1:a4:a3
-	a4:51:a2:90:be:2f:4d:33:75:13:3c:2c:e5:d7:55:88
-	15:a2:f9:11:49:8c:3b:e2:87:a4:9d:59:81:94:8f:92
-	a4:35:32:7c:d3:df:4d:2a:65:1a:9f:99:af:16:6e:0b
-	a9:5f:36:c3:38:9e:a7:dc:31:ee:df:29:da:25:61:66
-	6f:99:a7:aa:8a:d5:a4:26:af:f3:e1:12:1a:06:d0:79
-	03:6d:dc:63:6d:90:36:ae:3c:ce:7c:a0:68:ae:19:f9
-	ca:b1:40:5f:d0:df:94:c3:de:da:88:42:73:5e:f1:6d
-	1e:31:42:2b:44:4e:03:99:db:ce:6c:6c:c3:08:c9:71
-	fc:19:1a:97:25:55:ba:57:99:8a:29:e7:d7:3a:1c:92
-	4a:81:c5:d6:33:76:0b:7e:51:72:ec:41:bd:2b:22:bb
-	b4:39:45:26:06:7e:30:e3:21:6f:ef:75:59:62:a6:2d
-	f8:6f:90:a6:98:9e:e3:97:90:fe:7e:01:06:5b:ff:45
-	a2:da:68:8c:09:18:70:d3:07:ea:ad:86:60:34:4a:e0
-	ab:a4:06:67:f0:14:9f:c7:c7:85:d7:d2:96:ca:08:e7
-	cb:77:ba:b2:8f:a7:25:bc:b8:58:e6:f7:81:3d:66:51
-	09:
-
-prime1:
-	00:e9:2e:e7:c9:04:d8:5c:c0:cb:15:75:a4:b0:b6:1e
-	bb:ad:7e:45:9f:75:b9:ca:65:01:71:c6:30:42:55:01
-	77:61:a0:eb:ba:53:e1:cf:4d:0c:0e:d3:45:89:74:94
-	f4:c1:45:02:2a:49:66:4e:12:27:1f:6a:3b:15:e7:e8
-	fa:44:9e:97:59:58:2f:81:fd:12:f5:8d:37:94:fe:a4
-	8b:b3:60:ac:fc:56:7f:31:d0:7c:09:57:db:01:8f:5a
-	e7:b3:b5:1e:c9:6b:69:9f:3b:40:f6:d6:3d:a8:da:4f
-	66:e5:c3:3e:39:78:bf:32:aa:22:96:ca:0a:63:4d:57
-	f5:
-
-prime2:
-	00:ed:55:50:cd:f6:37:30:1d:33:20:bd:da:d8:46:78
-	8a:9d:9e:96:3e:e0:41:52:7a:fd:47:75:60:df:7e:f1
-	3d:45:0e:94:ab:94:cf:7b:06:be:84:b8:92:93:c6:41
-	a9:5f:4b:19:50:52:95:6c:92:ae:97:a6:34:e0:b4:38
-	33:31:49:a3:ec:75:c4:f8:8b:af:29:d2:00:df:36:a8
-	9b:ca:87:7e:b6:08:93:6c:ae:cd:64:53:b3:65:18:0d
-	db:2a:25:29:87:6d:82:24:2d:95:05:42:39:41:c3:33
-	c6:56:6d:62:46:fc:a4:ee:06:10:69:eb:8d:b7:6a:ae
-	e3:
-
-coefficient:
-	00:85:5a:72:f6:56:c1:8b:fb:8a:4d:01:14:c8:f7:97
-	4c:c5:ec:18:f6:66:64:55:3a:e9:8a:de:ae:88:04:69
-	36:97:a2:1c:3c:5c:af:cb:20:c2:74:b2:5e:0e:8b:ee
-	17:41:44:a0:35:f3:bc:85:8c:be:66:39:78:59:f4:05
-	c1:47:3c:d5:66:cc:1b:ac:82:b1:43:81:5a:63:c8:01
-	f1:6a:59:9b:10:b5:94:0e:86:d5:94:2e:8c:28:d2:e5
-	c2:73:b9:1b:a2:68:2e:c6:b0:0c:c5:4d:40:01:e3:c0
-	fc:33:41:06:10:17:3d:2c:87:5a:65:5a:ec:48:c3:0a
-	7d:
-
-exp1:
-	58:07:8a:1f:3c:42:05:fa:0e:70:e2:81:b2:e8:7d:ff
-	b2:06:7a:78:31:74:5b:30:f8:73:a0:33:35:c7:6b:8f
-	4a:fe:fa:1e:d4:6d:e9:d9:97:54:bd:73:81:e9:ce:15
-	fc:24:76:25:ca:a1:e1:95:3e:c9:c0:4b:e0:00:35:d6
-	cd:32:e5:c6:27:e1:7f:7c:2f:bd:1d:7b:bf:36:c6:9d
-	aa:b1:33:7c:eb:96:87:12:c2:d0:b0:27:10:96:b2:e5
-	c7:d4:f7:73:68:a6:6e:23:6b:6a:04:05:31:0a:81:71
-	42:0a:0c:22:9c:2f:ea:0b:8a:95:4c:5e:d1:90:30:45
-	
-
-exp2:
-	42:7b:21:95:70:20:e9:73:64:7d:09:71:a2:1f:ab:68
-	78:da:91:8f:af:55:dc:fa:e2:b3:ff:a7:51:33:c7:f3
-	b7:c2:6b:d6:dc:6a:7a:35:db:6c:66:1f:79:11:92:17
-	15:c0:7d:a8:c8:59:5e:fe:7f:b5:af:33:24:b6:96:ff
-	90:10:e6:c0:38:05:22:f2:4d:f0:d3:08:b7:7e:22:20
-	f1:cc:9e:ab:f3:1f:08:d4:b6:68:22:22:20:71:6a:80
-	38:00:0c:f0:08:b6:e9:d7:72:e4:f4:36:01:bb:e2:66
-	ee:92:d9:72:b5:16:a6:2e:40:ae:ca:f2:f9:ac:02:ad
-	
-
-
-Public Key PIN:
-	pin-sha256:KA2RAuj5YKCa3AD0hEi2XdHpRmGEDUNUtOzcaBe6PUk=
-Public Key ID:
-	sha256:280d9102e8f960a09adc00f48448b65dd1e94661840d4354b4ecdc6817ba3d49
-	sha1:a4662032ba2ba950dafc8faa2d7415d687de1284
-
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA2C4iwlJ+rtQhdOMnJ9sfEwjlMpKy0EABnSgAjZNpxZGXu/RX
-1swShr/r74D8iTH6L+Z0b9C5jIA8lK2pKpBmq1CpL8mnB9BWFES9WwN355Q3XLPt
-Gm4POYCAN82tQqOhKNw+5gEFduhFgX7Ok9IFLVQCPitPHzZpegzxz+EQwRAmGodh
-ARfeNJ05JrjiI+WJKusF5ya3PVyl+ZyxWvZyecuXtP7pfa4B/XGrBp7yRk8gMlOE
-6EvG2ODNwrgaJGGajogNuBkRklgv2SWh0uw1QynCfPzHtgM299MungD7q1Mi3uu0
-A/shjofxqpIQHtRE5DOXCVyr5BNTJfeMLc+EPwIDAQABAoIBAQCJcwQMs7DybdP7
-4rWxpKOkUaKQvi9NM3UTPCzl11WIFaL5EUmMO+KHpJ1ZgZSPkqQ1MnzT300qZRqf
-ma8WbgupXzbDOJ6n3DHu3ynaJWFmb5mnqorVpCav8+ESGgbQeQNt3GNtkDauPM58
-oGiuGfnKsUBf0N+Uw97aiEJzXvFtHjFCK0ROA5nbzmxswwjJcfwZGpclVbpXmYop
-59c6HJJKgcXWM3YLflFy7EG9KyK7tDlFJgZ+MOMhb+91WWKmLfhvkKaYnuOXkP5+
-AQZb/0Wi2miMCRhw0wfqrYZgNErgq6QGZ/AUn8fHhdfSlsoI58t3urKPpyW8uFjm
-94E9ZlEJAoGBAOku58kE2FzAyxV1pLC2HrutfkWfdbnKZQFxxjBCVQF3YaDrulPh
-z00MDtNFiXSU9MFFAipJZk4SJx9qOxXn6PpEnpdZWC+B/RL1jTeU/qSLs2Cs/FZ/
-MdB8CVfbAY9a57O1HslraZ87QPbWPajaT2blwz45eL8yqiKWygpjTVf1AoGBAO1V
-UM32NzAdMyC92thGeIqdnpY+4EFSev1HdWDffvE9RQ6Uq5TPewa+hLiSk8ZBqV9L
-GVBSlWySrpemNOC0ODMxSaPsdcT4i68p0gDfNqibyod+tgiTbK7NZFOzZRgN2yol
-KYdtgiQtlQVCOUHDM8ZWbWJG/KTuBhBp6423aq7jAoGAWAeKHzxCBfoOcOKBsuh9
-/7IGengxdFsw+HOgMzXHa49K/voe1G3p2ZdUvXOB6c4V/CR2Jcqh4ZU+ycBL4AA1
-1s0y5cYn4X98L70de782xp2qsTN865aHEsLQsCcQlrLlx9T3c2imbiNragQFMQqB
-cUIKDCKcL+oLipVMXtGQMEUCgYBCeyGVcCDpc2R9CXGiH6toeNqRj69V3Pris/+n
-UTPH87fCa9bcano122xmH3kRkhcVwH2oyFle/n+1rzMktpb/kBDmwDgFIvJN8NMI
-t34iIPHMnqvzHwjUtmgiIiBxaoA4AAzwCLbp13Lk9DYBu+Jm7pLZcrUWpi5Arsry
-+awCrQKBgQCFWnL2VsGL+4pNARTI95dMxewY9mZkVTrpit6uiARpNpeiHDxcr8sg
-wnSyXg6L7hdBRKA187yFjL5mOXhZ9AXBRzzVZswbrIKxQ4FaY8gB8WpZmxC1lA6G
-1ZQujCjS5cJzuRuiaC7GsAzFTUAB48D8M0EGEBc9LIdaZVrsSMMKfQ==
------END RSA PRIVATE KEY-----
diff --git a/roles/xmpp_server/molecule/default/tests/test_default.py b/roles/xmpp_server/molecule/default/tests/test_default.py
index 1049cde7880b741954a34557029785294ea9671f..ab473905930d53b2f7ae042dfcb1a49ab00cf022 100644
--- a/roles/xmpp_server/molecule/default/tests/test_default.py
+++ b/roles/xmpp_server/molecule/default/tests/test_default.py
@@ -160,14 +160,14 @@ def test_prosody_tls_files(host):
         assert tls_file.user == 'root'
         assert tls_file.group == 'prosody'
         assert tls_file.mode == 0o640
-        assert tls_file.content_string == open("tests/data/x509/%s_xmpp.key.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_xmpp.key.pem" % hostname, "r").read().rstrip()
 
         tls_file = host.file('/etc/ssl/certs/%s_xmpp.pem' % hostname)
         assert tls_file.is_file
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o644
-        assert tls_file.content_string == open("tests/data/x509/%s_xmpp.cert.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_xmpp.cert.pem" % hostname, "r").read().rstrip()
 
 
 # @TODO: Tests which were not implemented due to lack of out-of-box tools: