diff --git a/tasks/remount-off.yml b/tasks/remount-off.yml
index 2b3656e..6772884 100644
--- a/tasks/remount-off.yml
+++ b/tasks/remount-off.yml
@@ -16,9 +16,7 @@
   register: mount
   changed_when: False
   failed_when: False
-  # Use this with Ansible 2.1+
-  #when: not ansible_check_mod
-  always_run: yes
+  when: not ansible_check_mode
   with_items: "{{ partitions }}"
 
 - name: Remount /usr if it is a partition and it is not mounted in ro
diff --git a/tasks/remount-on.yml b/tasks/remount-on.yml
index ea7689e..ef1756a 100644
--- a/tasks/remount-on.yml
+++ b/tasks/remount-on.yml
@@ -17,9 +17,7 @@
   register: mount
   changed_when: False
   failed_when: False
-  # Use this with Ansible 2.1+
-  #when: not ansible_check_mod
-  always_run: yes
+  when: not ansible_check_mode
   with_items: "{{ partitions }}"
 
 - name: Remount /usr if it is a partition and it is not mounted in rw