diff --git a/tasks/set_vars.yml b/tasks/set_vars.yml
index dfe375c8..0027fc5e 100644
--- a/tasks/set_vars.yml
+++ b/tasks/set_vars.yml
@@ -1,4 +1,10 @@
 ---
+- name: Ensure ansible_facts used by role
+  setup:
+    gather_subset: min
+  when: not ansible_facts.keys() | list |
+    intersect(__storage_required_facts) == __storage_required_facts
+
 - name: Set platform/version specific variables
   include_vars: "{{ __vars_file }}"
   loop:
diff --git a/tests/tests_default.yml b/tests/tests_default.yml
index ece93ecd..83ee66cb 100644
--- a/tests/tests_default.yml
+++ b/tests/tests_default.yml
@@ -1,5 +1,5 @@
 - name: Ensure that the role runs with default parameters
   hosts: all
-
+  gather_facts: false
   roles:
     - linux-system-roles.storage
diff --git a/vars/main.yml b/vars/main.yml
new file mode 100644
index 00000000..600e4b59
--- /dev/null
+++ b/vars/main.yml
@@ -0,0 +1,6 @@
+# ansible_facts required by the role
+__storage_required_facts:
+  - distribution
+  - distribution_major_version
+  - distribution_version
+  - os_family