diff --git a/tests/tests_ethernet.yml b/tests/tests_ethernet.yml
index cb4459f..25f117d 100644
--- a/tests/tests_ethernet.yml
+++ b/tests/tests_ethernet.yml
@@ -19,7 +19,9 @@
         type: "{{ type }}"
         interface: "{{ interface }}"
     - include_tasks: tasks/show-interfaces.yml
-    - include_tasks: tasks/manage-test-interface.yml state=present
+    - include_tasks: tasks/manage-test-interface.yml
+      vars:
+        state: present
     - include_tasks: tasks/assert-device_present.yml
 
 - name: Test static interface up
@@ -54,5 +56,7 @@
 - name: Remove interfaces
   hosts: all
   tasks:
-    - include_tasks: tasks/manage-test-interface.yml state=absent
+    - include_tasks: tasks/manage-test-interface.yml
+      vars:
+        state: absent
     - include_tasks: tasks/assert-device_absent.yml
diff --git a/tests/tests_helpers-and-asserts.yml b/tests/tests_helpers-and-asserts.yml
index 33f3e84..36f02c2 100644
--- a/tests/tests_helpers-and-asserts.yml
+++ b/tests/tests_helpers-and-asserts.yml
@@ -17,7 +17,10 @@
 
 # FIXME: when: does not seem to work with include_tasks, therefore this cannot be safely tested for now
 #    - name: test tap interfaces
-#      include_tasks: tasks/create-and-remove-interface.yml type=tap interface=tap1298
+#      include_tasks: tasks/create-and-remove-interface.yml
+#      vars:
+#        - type: tap
+#        - interface: tap1298
 #      when: ansible_distribution_major_version > 6
 #      # ip tuntap does not exist on RHEL6
 #      # FIXME: Maybe use some other tool to manage devices, openvpn can do this,