diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml
index 44089da739294c1f6f339451f77286e8549250a1..ff42cc369d14f2fc0ef3e8c55da819ccd3d83f5d 100644
--- a/roles/common/molecule/default/prepare.yml
+++ b/roles/common/molecule/default/prepare.yml
@@ -9,7 +9,7 @@
     - name: Initialise CA hierarchy
       command: "gimmecert init --ca-hierarchy-depth 2"
       args:
-        creates: "tests/data/.gimmecert"
+        creates: ".gimmecert/ca/level1.cert.pem"
         chdir: "tests/data/"
 
     - name: Set-up link to generated X.509 material
@@ -46,5 +46,7 @@
   become: true
   tasks:
 
-    - name: Rename the ss utility (see https://github.com/philpep/testinfra/pull/320)
-      command: "mv /bin/ss /bin/ss.bak"
+    - name: Remove the ss utility (see https://github.com/philpep/testinfra/pull/320)
+      file:
+        path: "/bin/ss"
+        state: absent