diff --git a/tests/pytests/conftest.py b/tests/pytests/conftest.py
index 942ffc00d7a3c329feffa75dda8fba08a331e4d0..97e5e534781dc1881878de45aec3b1f09da767d9 100644
--- a/tests/pytests/conftest.py
+++ b/tests/pytests/conftest.py
@@ -38,7 +38,7 @@ def pytest_configure(config):
 
     config_dir = os.path.join(test_dir, "config")
     if os.path.exists(config_dir):
-        inventory_path = os.path.join(config_dir, "test.inventory.yaml")
+        inventory_path = os.path.join(config_dir, "test.inventory.yml")
         inventory = get_inventory(inventory_path)
         print("Configuring execution using {}".format(inventory_path))
         ipaservers = inventory["all"]["children"]["ipaserver"]["hosts"]
diff --git a/tests/pytests/dnszone/playbooks/dnszone_add_multiple_ipv4_ipv6_forwarders.yaml b/tests/pytests/dnszone/playbooks/dnszone_add_multiple_ipv4_ipv6_forwarders.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_add_multiple_ipv4_ipv6_forwarders.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_add_multiple_ipv4_ipv6_forwarders.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_add_without_forwarder.yaml b/tests/pytests/dnszone/playbooks/dnszone_add_without_forwarder.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_add_without_forwarder.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_add_without_forwarder.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_del_multiple.yaml b/tests/pytests/dnszone/playbooks/dnszone_del_multiple.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_del_multiple.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_del_multiple.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_disable.yaml b/tests/pytests/dnszone/playbooks/dnszone_disable.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_disable.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_disable.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_enable.yaml b/tests/pytests/dnszone/playbooks/dnszone_enable.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_enable.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_enable.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml b/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_invalid_serial.yaml b/tests/pytests/dnszone/playbooks/dnszone_invalid_serial.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_invalid_serial.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_invalid_serial.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_name_from_ip.yaml b/tests/pytests/dnszone/playbooks/dnszone_name_from_ip.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_name_from_ip.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_name_from_ip.yml
diff --git a/tests/pytests/dnszone/playbooks/dnszone_with_forward_policy_only.yaml b/tests/pytests/dnszone/playbooks/dnszone_with_forward_policy_only.yml
similarity index 100%
rename from tests/pytests/dnszone/playbooks/dnszone_with_forward_policy_only.yaml
rename to tests/pytests/dnszone/playbooks/dnszone_with_forward_policy_only.yml
diff --git a/tests/pytests/dnszone/test_dnszone.py b/tests/pytests/dnszone/test_dnszone.py
index 67a985482de2b0ae96e84eeff83d76214572095a..ab8b995fc2004678af9fa3db8c2b035b1180fa7b 100644
--- a/tests/pytests/dnszone/test_dnszone.py
+++ b/tests/pytests/dnszone/test_dnszone.py
@@ -31,7 +31,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
         """TC-01: Add dns zone without forwarder."""
         zone01 = "01testzone.test"
         self.check_notexists([zone01], "dnszone-find")
-        self.run_playbook(BASE_PATH + "dnszone_add_without_forwarder.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_add_without_forwarder.yml")
         self.check_details([zone01], "dnszone-find")
 
     def test_dnszone_add_multiple_ipv4_ipv6_forwarders(self):
@@ -41,7 +41,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
 
         # add dns zone with multiple forwarders
         self.run_playbook(
-            (BASE_PATH + "dnszone_add_multiple_ipv4_ipv6_forwarders.yaml")
+            (BASE_PATH + "dnszone_add_multiple_ipv4_ipv6_forwarders.yml")
         )
 
         exp_forwarders = [
@@ -58,7 +58,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
         zone26 = "26testzone.test"
         self.check_notexists([zone26], "dnszone-find")
         # add dns zone
-        self.run_playbook(BASE_PATH + "dnszone_with_forward_policy_only.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_with_forward_policy_only.yml")
         self.check_details(["Forward policy: only"], "dnszone-find", [zone26])
 
     def test_dnszone_disable(self):
@@ -68,7 +68,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
             ["Active zone: (TRUE|True)"], "dnszone-find", [zone26]
         )
         # Disable dns zone
-        self.run_playbook(BASE_PATH + "dnszone_disable.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_disable.yml")
         self.check_details(
             ["Active zone: (FALSE|False)"], "dnszone-find", [zone26]
         )
@@ -80,7 +80,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
             ["Active zone: (FALSE|False)"], "dnszone-find", [zone26]
         )
         # Enable dns zone
-        self.run_playbook(BASE_PATH + "dnszone_enable.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_enable.yml")
         self.check_details(
             ["Active zone: (TRUE|True)"], "dnszone-find", [zone26]
         )
@@ -96,7 +96,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
             reason="Fix is not available for BZ-1845056",
         )
 
-        self.run_playbook(BASE_PATH + "dnszone_name_from_ip.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_name_from_ip.yml")
         self.check_details([expected_msg], "dnszone-find", [zone])
 
     def test_dnszone_del_multiple(self):
@@ -113,7 +113,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
             reason="Fix is not available for BZ-1845058",
         )
 
-        self.run_playbook(BASE_PATH + "dnszone_del_multiple.yaml")
+        self.run_playbook(BASE_PATH + "dnszone_del_multiple.yml")
         # verify multiple dnszones are removed
         for add_zone in zone:
             error = "ipa: ERROR: {0}.: DNS zone not found".format(add_zone)
@@ -131,7 +131,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
         )
 
         self.run_playbook_with_exp_msg(
-            BASE_PATH + "dnszone_invalid_ip.yaml", expected_error,
+            BASE_PATH + "dnszone_invalid_ip.yml", expected_error,
         )
         self.check_notexists(
             [invalid_zone_ip], "dnszone-show", [invalid_zone_name],