diff --git a/playbooks/roles/robotuser/molecule/default/molecule.yml b/playbooks/roles/robotuser/molecule/default/molecule.yml
index 50356e70..6bc50cb0 100644
--- a/playbooks/roles/robotuser/molecule/default/molecule.yml
+++ b/playbooks/roles/robotuser/molecule/default/molecule.yml
@@ -17,4 +17,5 @@ provisioner:
     prepare: ./prepare.yml
   env:
     ANSIBLE_ROLES_PATH: ../../../
+    ANSIBLE_SKIP_TAGS: mount, molecule-notest
 role_name_check: 1
diff --git a/playbooks/roles/sshfs_cleanup/tasks/main.yml b/playbooks/roles/sshfs_cleanup/tasks/main.yml
index 8fb68e53..0ce76eba 100644
--- a/playbooks/roles/sshfs_cleanup/tasks/main.yml
+++ b/playbooks/roles/sshfs_cleanup/tasks/main.yml
@@ -13,7 +13,7 @@
     state: unmounted
 
 - name: Cleanup robotuser
-  tags: molecule-notest
+  tags: mount
   user:
     name: "{{ robotuser_name }}"
     state: absent
diff --git a/playbooks/roles/sshfs_mount/tasks/mount.yml b/playbooks/roles/sshfs_mount/tasks/mount.yml
index 43373d83..559de011 100644
--- a/playbooks/roles/sshfs_mount/tasks/mount.yml
+++ b/playbooks/roles/sshfs_mount/tasks/mount.yml
@@ -2,7 +2,8 @@
 - name: Mount remote filesystem using credentials of robot user
   become_user: "{{ sshfs_connection_info.username }}"
   become: "{{ item.become }}"
-  when: "'molecule-notest' not in ansible_skip_tags or item.state == 'present'" # don't actually mount when running in container
+  tags: mount
+  when: item.state == 'present'" # don't actually mount when running in container
   mount:
     src: "sshfs#{{ sshfs_connection_info.username }}@{{ sshfs_connection_info.server }}:{{ sshfs_connection_info.sourcepath }}"
     path: "{{ sshfs_connection_info.mountpoint }}"