diff --git a/tests/role/env_facts.yml b/tests/role/env_facts.yml
index dbc16a962e2f4d18d712c345dca3482f27113998..30341839bffa2ceba1bd7ab5642b9c265412273d 100644
--- a/tests/role/env_facts.yml
+++ b/tests/role/env_facts.yml
@@ -1,21 +1,21 @@
 ---
 - block:
   - name: Get Domain from server name
-    set_fact:
+    ansible.builtin.set_fact:
       ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
     when: "'fqdn' in ansible_facts"
   - name: Set Domain to 'ipa.test' if FQDN could not be retrieved.
-    set_fact:
+    ansible.builtin.set_fact:
       ipaserver_domain: "ipa.test"
     when: "'fqdn' not in ansible_facts"
   when: ipaserver_domain is not defined
 
 - name: Set ipaserver_realm.
-  set_fact:
+  ansible.builtin.set_fact:
     ipaserver_realm: "{{ ipaserver_domain | upper }}"
   when: ipaserver_realm is not defined
 
 - name: Create FQDN for host01
-  set_fact:
+  ansible.builtin.set_fact:
     host1_fqdn: "host01.{{ ipaserver_domain }}"
     host2_fqdn: "host02.{{ ipaserver_domain }}"
diff --git a/tests/role/env_setup.yml b/tests/role/env_setup.yml
index eb72c82be49c03a491075353eb066c9cc279ceeb..6a24839e11ff6e47fa21409e9d96e0ac50dd6eee 100644
--- a/tests/role/env_setup.yml
+++ b/tests/role/env_setup.yml
@@ -1,6 +1,6 @@
 ---
 - name: Cleanup environment.
-  import_tasks: env_cleanup.yml
+  ansible.builtin.import_tasks: env_cleanup.yml
 
 - name: Ensure test user is present.
   ipauser:
diff --git a/tests/role/test_role.yml b/tests/role/test_role.yml
index 5c4f81b924e7459d04ff0f64337ab6e8794137f0..884cbcd3e74cfc0c85a824d775ea8cc1f4312adb 100644
--- a/tests/role/test_role.yml
+++ b/tests/role/test_role.yml
@@ -6,10 +6,10 @@
 
   tasks:
   - name: Set environment facts.
-    import_tasks: env_facts.yml
+    ansible.builtin.import_tasks: env_facts.yml
 
   - name: Setup environment.
-    import_tasks: env_setup.yml
+    ansible.builtin.import_tasks: env_setup.yml
 
   # tests
   - name: Ensure role is present.
@@ -424,4 +424,4 @@
 
   # cleanup
   - name: Cleanup environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/role/test_role_client_context.yml b/tests/role/test_role_client_context.yml
index cb1bbba8e85acadc4ab32ba987fad79f74df20d3..3a87a2cc69af39411042fd0c10ae910d5c0e8d0b 100644
--- a/tests/role/test_role_client_context.yml
+++ b/tests/role/test_role_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 role using client context, in client host.
-  import_playbook: test_role.yml
+  ansible.builtin.import_playbook: test_role.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test role using client context, in server host.
-  import_playbook: test_role.yml
+  ansible.builtin.import_playbook: test_role.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/role/test_role_lists_handling.yml b/tests/role/test_role_lists_handling.yml
index ca3f023c81c11c9631a4d1b4e806988d388a0de3..f8911ac428b8056cb810e74efa77385b9595ca6e 100644
--- a/tests/role/test_role_lists_handling.yml
+++ b/tests/role/test_role_lists_handling.yml
@@ -6,10 +6,10 @@
 
   tasks:
   - name: Set environment facts.
-    import_tasks: env_facts.yml
+    ansible.builtin.import_tasks: env_facts.yml
 
   - name: Setup environment.
-    import_tasks: env_setup.yml
+    ansible.builtin.import_tasks: env_setup.yml
 
   - name: Add role.
     iparole:
@@ -41,7 +41,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role privileges.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -71,7 +71,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role users.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -95,7 +95,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role group.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -119,7 +119,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role hosts.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -145,7 +145,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role hostgroups.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -169,7 +169,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role services.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -197,7 +197,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role services.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -225,7 +225,7 @@
     failed_when: result.failed or not result.changed
 
   - name: Verify role services.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
         KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -256,4 +256,4 @@
 
   # cleanup
   - name: Cleanup environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/role/test_role_member_case_insensitive.yml b/tests/role/test_role_member_case_insensitive.yml
index 3f386fc3eaaf1b44a6b4fe03475f3543dbd63a08..d5d5a6c6e078500616baa173dc88a839e0d07d0f 100644
--- a/tests/role/test_role_member_case_insensitive.yml
+++ b/tests/role/test_role_member_case_insensitive.yml
@@ -22,7 +22,7 @@
       - MySVC/host01
 
   tasks:
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   - block:
       # setup
diff --git a/tests/role/test_role_service_member.yml b/tests/role/test_role_service_member.yml
index 307dc94f3cedc9d1124fd99983a112909e3ff55f..13fa083eb8f241e432adc64e648f556f8c4df0de 100644
--- a/tests/role/test_role_service_member.yml
+++ b/tests/role/test_role_service_member.yml
@@ -6,10 +6,10 @@
 
   tasks:
   - name: Set environment facts.
-    import_tasks: env_facts.yml
+    ansible.builtin.import_tasks: env_facts.yml
 
   - name: Setup environment.
-    import_tasks: env_setup.yml
+    ansible.builtin.import_tasks: env_setup.yml
 
   # tests
 
@@ -92,4 +92,4 @@
 
   # cleanup
   - name: Cleanup environment.
-    include_tasks: env_cleanup.yml
+    ansible.builtin.include_tasks: env_cleanup.yml