diff --git a/test/integration/targets/lookup_passwordstore/aliases b/test/integration/targets/lookup_passwordstore/aliases
index 67d9297b79..d1597d2d97 100644
--- a/test/integration/targets/lookup_passwordstore/aliases
+++ b/test/integration/targets/lookup_passwordstore/aliases
@@ -1,3 +1,3 @@
 shippable/posix/group2
 destructive
-skip/rhel8.0
+skip/rhel
diff --git a/test/integration/targets/lookup_passwordstore/tasks/main.yml b/test/integration/targets/lookup_passwordstore/tasks/main.yml
index 2f39bb637d..1177714a04 100644
--- a/test/integration/targets/lookup_passwordstore/tasks/main.yml
+++ b/test/integration/targets/lookup_passwordstore/tasks/main.yml
@@ -1,4 +1,6 @@
-- include: "package.yml"
-  when: "ansible_distribution_version not in passwordstore_skip_os.get(ansible_distribution, [])"
-- include: "tests.yml"
-  when: "ansible_distribution_version not in passwordstore_skip_os.get(ansible_distribution, [])"
+- block:
+    - include: "package.yml"
+    - include: "tests.yml"
+  when:
+    - not (ansible_distribution == 'RedHat')  # requires EPEL
+    - not (ansible_distribution == 'CentOS' and ansible_distribution_version is version_compare('7', '<'))
diff --git a/test/integration/targets/lookup_passwordstore/vars/main.yml b/test/integration/targets/lookup_passwordstore/vars/main.yml
index 69f347ead7..aa464879ef 100644
--- a/test/integration/targets/lookup_passwordstore/vars/main.yml
+++ b/test/integration/targets/lookup_passwordstore/vars/main.yml
@@ -56,7 +56,3 @@ passwordstore_privkey: |
   SxHTvI2pKk+gx0FB8wWhd/CocAHJpx9oNUs/7A==
   =ZF3O
   -----END PGP PRIVATE KEY BLOCK-----
-passwordstore_skip_os:
-  Ubuntu: ['12.04']
-  RedHat: ['7.4']
-  CentOS: ['6.9', '6.10']