diff --git a/tests/integration/targets/at/tasks/main.yml b/tests/integration/targets/at/tasks/main.yml
index c4366c0..69c3efc 100644
--- a/tests/integration/targets/at/tasks/main.yml
+++ b/tests/integration/targets/at/tasks/main.yml
@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+
 - set_fact: output_dir_test={{output_dir}}/at
 
 - name: make sure our testing sub-directory does not exist
@@ -97,7 +98,7 @@
     that:
       - at_add is changed
       - at_removal is changed
-  when: ansible_distribution not in ('Ubuntu', 'FreeBSD') or ansible_distribution == 'CentOS' and  distributed_major_version > 6
+  when: (ansible_facts['distribution'] == "CentOS" and ansible_facts['distribution_major_version'] != "6") or (ansible_facts['distribution'] not in ('Ubuntu','FreeBSD'))
 
 - name: Create an at command with chdir with valid value
   at: