diff --git a/tests/idrange/tasks_set_trust.yml b/tests/idrange/tasks_set_trust.yml
index 4c414bbe3815877b45ab15abba65b99c11fdee28..bb81bf309eb24868077e0c0efd2df72615c14b9c 100644
--- a/tests/idrange/tasks_set_trust.yml
+++ b/tests/idrange/tasks_set_trust.yml
@@ -23,7 +23,7 @@
   failed_when: result.failed
 
 - name: Retrieve Domain Security Identifier
-  shell:
+  ansible.builtin.shell:
     cmd: |
       kinit -c test_krb5_cache admin <<< SomeADMINpassword > /dev/null
       KRB5CCNAME=test_krb5_cache ipa trust-show {{ adserver.domain }} | sed -n "/Domain Security Identifier/s/ //gp" | cut -d":" -f2
@@ -32,5 +32,5 @@
   no_log: yes
 
 - name: Set ipa_domain_sid.
-  set_fact:
+  ansible.builtin.set_fact:
     ipa_domain_sid: "{{ getsid.stdout }}"
diff --git a/tests/idrange/test_idrange.yml b/tests/idrange/test_idrange.yml
index 5c4da9404006f1d4d0b5e847c5b1a80001d750be..32a3231ff85b53c1dd3b4e598831c2d07e664d0d 100644
--- a/tests/idrange/test_idrange.yml
+++ b/tests/idrange/test_idrange.yml
@@ -14,7 +14,7 @@
   tasks:
   # CLEANUP TEST ITEMS
   - name: Remove test trust.
-    include_tasks: tasks_remove_trust.yml
+    ansible.builtin.include_tasks: tasks_remove_trust.yml
     when: trust_test_is_supported | default(false)
 
   - name: Ensure testing idranges are absent
@@ -121,7 +121,7 @@
   - block:
       # Create trust with range_type: ipa-ad-trust
       - name: Create trust with range_type 'ipa-ad-trust'
-        include_tasks: tasks_set_trust.yml
+        ansible.builtin.include_tasks: tasks_set_trust.yml
         vars:
           trust_base_id: 10000000
           trust_range_size: 200000
@@ -218,7 +218,7 @@
 
       # Remove trust and idrange
       - name: Remove test trust.
-        include_tasks: tasks_remove_trust.yml
+        ansible.builtin.include_tasks: tasks_remove_trust.yml
 
       - name: Ensure AD-trust idrange is absent
         ipaidrange:
@@ -229,7 +229,7 @@
 
       # Create trust with range_type: ipa-ad-trust-posix
       - name: Create trust with range_type 'ipa-ad-trust'
-        include_tasks: tasks_set_trust.yml
+        ansible.builtin.include_tasks: tasks_set_trust.yml
         vars:
           trust_base_id: 10000000
           trust_range_size: 200000
@@ -251,7 +251,7 @@
 
       # Remove trust and idrange
       - name: Remove test trust.
-        include_tasks: tasks_remove_trust.yml
+        ansible.builtin.include_tasks: tasks_remove_trust.yml
 
       - name: Ensure AD-trust idrange is absent
         ipaidrange:
@@ -262,7 +262,7 @@
 
       # Remove trust and idrange
       - name: Remove test trust.
-        include_tasks: tasks_remove_trust.yml
+        ansible.builtin.include_tasks: tasks_remove_trust.yml
 
       - name: Ensure AD-trust idrange is absent
         ipaidrange:
@@ -273,7 +273,7 @@
 
       # Create trust with range_type: ipa-ad-trust-posix
       - name: Create trust with range_type 'ipa-ad-trust-posix'
-        include_tasks: tasks_set_trust.yml
+        ansible.builtin.include_tasks: tasks_set_trust.yml
         vars:
           trust_base_id: 10000000
           trust_range_size: 2000000
@@ -319,7 +319,7 @@
 
       # Remove trust and idrange
       - name: Remove test trust.
-        include_tasks: tasks_remove_trust.yml
+        ansible.builtin.include_tasks: tasks_remove_trust.yml
 
       - name: Ensure AD-trust idrange is absent
         ipaidrange:
@@ -330,7 +330,7 @@
 
       # Create trust with range_type: ipa-ad-trust-posix
       - name: Create trust with range_type 'ipa-ad-trust-posix'
-        include_tasks: tasks_set_trust.yml
+        ansible.builtin.include_tasks: tasks_set_trust.yml
         vars:
           trust_base_id: 10000000
           trust_range_size: 2000000
@@ -352,7 +352,7 @@
     always:
       # CLEANUP TEST ITEMS
       - name: Remove test trust.
-        include_tasks: tasks_remove_trust.yml
+        ansible.builtin.include_tasks: tasks_remove_trust.yml
 
       - name: Ensure testing idranges are absent
         ipaidrange:
diff --git a/tests/idrange/test_idrange_client_context.yml b/tests/idrange/test_idrange_client_context.yml
index e0f4447a5e0055b744a67d935c97541eaefc6f12..71f188d672516d229ecd4907e0c5f268c478908c 100644
--- a/tests/idrange/test_idrange_client_context.yml
+++ b/tests/idrange/test_idrange_client_context.yml
@@ -8,7 +8,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.
@@ -29,11 +29,11 @@
 # in upstream CI.
 
 - name: Test idrange using client context, in client host.
-  import_playbook: test_idrange.yml
+  ansible.builtin.import_playbook: test_idrange.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test idrange using client context, in server host.
-  import_playbook: test_idrange.yml
+  ansible.builtin.import_playbook: test_idrange.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']