diff --git a/t/scenarios/_common/ansible/roles/common/tasks/main.yml b/t/scenarios/_common/ansible/roles/common/tasks/main.yml
index ab716a82b..3b99b8d10 100644
--- a/t/scenarios/_common/ansible/roles/common/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/common/tasks/main.yml
@@ -7,7 +7,7 @@
     sed -i -e 's%mirror.centos.org%vault.centos.org%g' /etc/yum.repos.d/CentOS-Base.repo
     sed -i -e 's%^mirrorlist=%#mirrorlist=%g'          /etc/yum.repos.d/CentOS-Base.repo
     sed -i -e 's%^#baseurl=%baseurl=%g'                /etc/yum.repos.d/CentOS-Base.repo
-  when: ansible_distribution_major_version|int == 7
+  when: ansible_distribution_major_version is defined and ansible_distribution_major_version|int == 7
 
 - name: "run set_admin_password"
   shell: "! test -x /omd/sites/{{site}}/bin/set_admin_password || sudo su - {{ site }} -c 'set_admin_password omd'"
diff --git a/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml b/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
index 0246c97c1..339a8bb70 100644
--- a/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
+++ b/t/scenarios/_common/ansible/roles/thruk_developer/tasks/main.yml
@@ -19,7 +19,7 @@
   vars:
     package:
       - glibc-langpack-en
-  when: not locale_path.stat.exists and ansible_distribution_major_version|int >= 8
+  when: not locale_path.stat.exists and ansible_distribution_version|int >= 8
 
 - name: "install File::ChangeNotify"
   shell: "sudo su - {{ site }} -c 'cpanm -n File::ChangeNotify'"