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"