diff --git a/tests/group/test_group.yml b/tests/group/test_group.yml
index 8395d6b57269b215973de8ea41ce6b64b194d8da..d728e45f61e82f6e88eb457cc2c4eb1bdb3a34ec 100644
--- a/tests/group/test_group.yml
+++ b/tests/group/test_group.yml
@@ -6,12 +6,12 @@
 
   tasks:
   # setup
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   # GET FQDN_AT_DOMAIN
 
   - name: Get fqdn_at_domain
-    set_fact:
+    ansible.builtin.set_fact:
       fqdn_at_domain: "{{ ansible_facts['fqdn'] + '@' + ipaserver_realm }}"
 
   # CLEANUP TEST ITEMS
diff --git a/tests/group/test_group_client_context.yml b/tests/group/test_group_client_context.yml
index 45e8467b2e76b0778276484fe50ebf9e745cd8bb..4a1d7ac92013f1c6e7f290d7c02621cfce23bc43 100644
--- a/tests/group/test_group_client_context.yml
+++ b/tests/group/test_group_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 group using client context, in client host.
-  import_playbook: test_group.yml
+  ansible.builtin.import_playbook: test_group.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test group using client context, in server host.
-  import_playbook: test_group.yml
+  ansible.builtin.import_playbook: test_group.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/group/test_group_external_members.yml b/tests/group/test_group_external_members.yml
index 5b2f320275bb6829e56586925d87cdb01b42260d..a24958d5ddb3677b2fde7e18f5834bb05dc01a9c 100644
--- a/tests/group/test_group_external_members.yml
+++ b/tests/group/test_group_external_members.yml
@@ -6,7 +6,7 @@
 
   tasks:
 
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   - block:
 
diff --git a/tests/group/test_group_idoverrideuser.yml b/tests/group/test_group_idoverrideuser.yml
index 3a5be5069ce27a318b0425984aa2360b3adf87d5..2dc788451e7fce21c8eb5fcf562549b9d89451b6 100644
--- a/tests/group/test_group_idoverrideuser.yml
+++ b/tests/group/test_group_idoverrideuser.yml
@@ -9,11 +9,11 @@
       ad_domain: "{{ test_ad_domain | default('ad.ipa.test') }}"
 
   tasks:
-    - include_tasks: ../env_freeipa_facts.yml
+    - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
     - block:
       - name: Create idoverrideuser.
-        shell: |
+        ansible.builtin.shell: |
           kinit -c idoverride_cache admin <<< SomeADMINpassword
           ipa idoverrideuser-add "Default Trust View" {{ ad_user }}
           kdestroy -A -q -c idoverride_cache
@@ -95,7 +95,7 @@
 
       always:
       - name: Remove idoverrideuser.
-        shell: |
+        ansible.builtin.shell: |
           kinit -c idoverride_cache admin <<< SomeADMINpassword
           ipa idoverrideuser-del "Default Trust View" {{ ad_user }}
           kdestroy -A -q -c idoverride_cache
diff --git a/tests/group/test_group_membermanager.yml b/tests/group/test_group_membermanager.yml
index 4105e75de22541c00b81af19f5954a72fbc47837..209301b8c601a4055361e684f11a8b119244a4f6 100644
--- a/tests/group/test_group_membermanager.yml
+++ b/tests/group/test_group_membermanager.yml
@@ -5,7 +5,7 @@
   gather_facts: false
 
   tasks:
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   - name: Tests requiring IPA version 4.8.4+
     block: