diff --git a/tests/dnsrecord/env_setup.yml b/tests/dnsrecord/env_setup.yml
index 7c0c0810aff01125626fe3317c53928249497e30..73e9f30597b7b360f7a32b66eacc1be4e89b0a2c 100644
--- a/tests/dnsrecord/env_setup.yml
+++ b/tests/dnsrecord/env_setup.yml
@@ -1,10 +1,10 @@
 ---
   - name: Setup variables and facts.
-    include_tasks: env_vars.yml
+    ansible.builtin.include_tasks: env_vars.yml
 
   # Cleanup before setup.
   - name: Cleanup test environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml
 
   # Common setup tasks.
   - name: Ensure DNS testing zones are present.
diff --git a/tests/dnsrecord/env_vars.yml b/tests/dnsrecord/env_vars.yml
index 0e979988e2283823db6f35efb48acd65f5ef9471..dfa7a8cddb7c351c4ad4b3f6b3be7dac9ff302bf 100644
--- a/tests/dnsrecord/env_vars.yml
+++ b/tests/dnsrecord/env_vars.yml
@@ -1,7 +1,7 @@
 ---
 # Set common vars and facts for test.
 - name: Set IPv4 address prefix.
-  set_fact:
+  ansible.builtin.set_fact:
     ipv4_prefix: "{{ ansible_facts['default_ipv4'].address.split('.')[:-1] |
                      join('.') }}"
     ipv4_reverse: "{{ ansible_facts['default_ipv4'].address.split('.')[:-1] |
@@ -9,7 +9,7 @@
                       join('.') }}"
 
 - name: Set zone prefixes.
-  set_fact:
+  ansible.builtin.set_fact:
     testzone: 'testzone.test'
     safezone: 'safezone.test'
     zone_ipv6_reverse: "ip6.arpa."
diff --git a/tests/dnsrecord/test_dnsrecord.yml b/tests/dnsrecord/test_dnsrecord.yml
index d13807f6c4c8f1e54dfd86de6fc98c93991f37ca..b203d366001a48117de2860e24b6f37625c861dd 100644
--- a/tests/dnsrecord/test_dnsrecord.yml
+++ b/tests/dnsrecord/test_dnsrecord.yml
@@ -7,10 +7,10 @@
   tasks:
 
   - name: Setup testing environment.
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -1547,7 +1547,7 @@
 
   # cleanup
   - name: Cleanup test environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml
 
   - name: Remove certificate files.  # noqa: deprecated-command-syntax
     ansible.builtin.shell: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
diff --git a/tests/dnsrecord/test_dnsrecord_client_context.yml b/tests/dnsrecord/test_dnsrecord_client_context.yml
index 44f59d5631a9ee591810b0fe10e784041450c116..651e17b5b61f9b38b830263e1bfdb797b6faec58 100644
--- a/tests/dnsrecord/test_dnsrecord_client_context.yml
+++ b/tests/dnsrecord/test_dnsrecord_client_context.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Include FreeIPA facts.
-    include_tasks: ../env_freeipa_facts.yml
+    ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   # Test will only be executed if host is not a server.
   - name: Execute with server context in the client.
@@ -27,13 +27,13 @@
 # in upstream CI.
 
 - name: Test dnsrecord using client context, in client host.
-  import_playbook: test_dnsrecord.yml
+  ansible.builtin.import_playbook: test_dnsrecord.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test dnsrecord using client context, in server host.
-  import_playbook: test_dnsrecord.yml
+  ansible.builtin.import_playbook: test_dnsrecord.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/dnsrecord/test_dnsrecord_full_records.yml b/tests/dnsrecord/test_dnsrecord_full_records.yml
index cd703d137ea11fab94bd857d094d07c3436b312d..af0bc8cb2e4669d550218f3ff34e81ba6d34a26a 100644
--- a/tests/dnsrecord/test_dnsrecord_full_records.yml
+++ b/tests/dnsrecord/test_dnsrecord_full_records.yml
@@ -7,7 +7,7 @@
   tasks:
 
   - name: Setup test environment
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   # tests
 
@@ -147,4 +147,4 @@
 
   # Cleanup
   - name: Cleanup test environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnsrecord/test_dnsrecord_modify_record.yml b/tests/dnsrecord/test_dnsrecord_modify_record.yml
index 6ffd583b8552f3805b7860b3aeb0e70fb8383595..20d787419dfab80ac33c9fa04f5dc68dbb6f58ae 100644
--- a/tests/dnsrecord/test_dnsrecord_modify_record.yml
+++ b/tests/dnsrecord/test_dnsrecord_modify_record.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Setup testing environment.
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   - name: Add test host.
     ipahost:
@@ -177,4 +177,4 @@
       state: absent
   # cleanup
   - name: Cleanup test environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml