diff --git a/tests/inventory.yml b/tests/inventory.yml
index 096ad7b..ec8a55f 100644
--- a/tests/inventory.yml
+++ b/tests/inventory.yml
@@ -1,4 +1,6 @@
 - hosts: localhost
+  tags:
+    - always
   tasks:
     - name: Get inventory with empty input
       command: merge-standard-inventory
@@ -6,6 +8,7 @@
         # Reset vars to default values
         TEST_SUBJECTS:
       register: inventory
+      delegate_to: localhost
     - name: Assert merge-standard-inventory produces correct JSON inventory (list)
       fail:
       when: inventory.stdout|from_json|json_query('subjects.hosts')|type_debug != 'list'
diff --git a/tests/shared-tasks/req-pkg.yml b/tests/shared-tasks/req-pkg.yml
index 59fa5fb..2d39496 100644
--- a/tests/shared-tasks/req-pkg.yml
+++ b/tests/shared-tasks/req-pkg.yml
@@ -1,3 +1,7 @@
+- include_role:
+    name: str-common
+    tasks_from: inspect.yml
+
 - set_fact:
     req_pkg: zsh
 
@@ -5,3 +9,4 @@
   package:
     name: "{{req_pkg}}"
     state: absent
+  when: not is_atomic