diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index 1db7dea13111381d035df96598b679064e1b11b8..a1c5ead800cb195659dac0677f037d61a1ae47a0 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -120,12 +120,16 @@
         group: vagrant
         mode: 0755
 
-    - name: Configure default location for storing ClamAV database files
+    - name: Configure default location for storing ClamAV database files  # noqa no-changed-when
+      # [no-changed-when] Commands should not change things if nothing needs doing
+      #   Does not matter in test prepare step.
       become: true
       become_user: vagrant
       command: "/var/lib/cvdupdate/bin/cvd config set --dbdir /vagrant/clamav-database/"
 
-    - name: Download/update the ClamAV database files
+    - name: Download/update the ClamAV database files  # noqa no-changed-when
+      # [no-changed-when] Commands should not change things if nothing needs doing
+      #   Does not matter in test prepare stage.
       become: true
       become_user: vagrant
       command: "/var/lib/cvdupdate/bin/cvd update"
@@ -330,8 +334,10 @@
 
   handlers:
 
-    - name: Update CA certificate cache
+    - name: Update CA certificate cache  # noqa no-changed-when
       command: /usr/sbin/update-ca-certificates --fresh
+      # [no-changed-when] Commands should not change things if nothing needs doing
+      #   Does not matter in test prepare stage.
 
     - name: Restart Postfix
       service: