diff --git a/tests/netgroup/test_netgroup.yml b/tests/netgroup/test_netgroup.yml
index d4ac69e9610bd8a689e30318b7d11dc6035c5188..ffc8cef117b1ec51de93d2e6768c1d07bd2f2c8e 100644
--- a/tests/netgroup/test_netgroup.yml
+++ b/tests/netgroup/test_netgroup.yml
@@ -19,7 +19,7 @@
 
     # CREATE TEST ITEMS
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
diff --git a/tests/netgroup/test_netgroup_client_context.yml b/tests/netgroup/test_netgroup_client_context.yml
index f5a4dd3ad25b7ce3c9dac2617ba7101e11345f70..8d92ee6f71ea8b0e478d2b57c1f4ac3b05214ad7 100644
--- a/tests/netgroup/test_netgroup_client_context.yml
+++ b/tests/netgroup/test_netgroup_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,25 +27,25 @@
 # in upstream CI.
 
 - name: Test netgroup using client context, in client host.
-  import_playbook: test_netgroup.yml
+  ansible.builtin.import_playbook: test_netgroup.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test netgroup using client context, in server host.
-  import_playbook: test_netgroup.yml
+  ansible.builtin.import_playbook: test_netgroup.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
 
 - name: Test netgroup with member using client context, in client host.
-  import_playbook: test_netgroup_member.yml
+  ansible.builtin.import_playbook: test_netgroup_member.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test netgroup with member using client context, in server host.
-  import_playbook: test_netgroup_member.yml
+  ansible.builtin.import_playbook: test_netgroup_member.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/netgroup/test_netgroup_member.yml b/tests/netgroup/test_netgroup_member.yml
index c8365422861c80edda17b5f189855b5854c9943f..ac67fbe844f8e38589aa10add8c6668c6f48c0f6 100644
--- a/tests/netgroup/test_netgroup_member.yml
+++ b/tests/netgroup/test_netgroup_member.yml
@@ -7,12 +7,12 @@
   tasks:
   - block:
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Set host1_fqdn .. host2_fqdn
-      set_fact:
+      ansible.builtin.set_fact:
         host1_fqdn: "{{ 'host1.' + ipaserver_domain }}"
         host2_fqdn: "{{ 'host2.' + ipaserver_domain }}"
 
diff --git a/tests/netgroup/test_netgroup_member_absent.yml b/tests/netgroup/test_netgroup_member_absent.yml
index 14376cd2431771ebf5c7bb0988ae8a8c7733ec64..2da3125be03c62149f303309e22828e331a285af 100644
--- a/tests/netgroup/test_netgroup_member_absent.yml
+++ b/tests/netgroup/test_netgroup_member_absent.yml
@@ -7,12 +7,12 @@
   tasks:
   - block:
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Set host1_fqdn .. host2_fqdn
-      set_fact:
+      ansible.builtin.set_fact:
         host1_fqdn: "{{ 'host1.' + ipaserver_domain }}"
         host2_fqdn: "{{ 'host2.' + ipaserver_domain }}"
 
diff --git a/tests/netgroup/test_netgroup_member_case_insensitive.yml b/tests/netgroup/test_netgroup_member_case_insensitive.yml
index abd12593e13aeeae0e2d3035115ef4de64d44040..62aadc52f0ee725de25b94a5846b76f9858552d7 100644
--- a/tests/netgroup/test_netgroup_member_case_insensitive.yml
+++ b/tests/netgroup/test_netgroup_member_case_insensitive.yml
@@ -16,7 +16,7 @@
   - block:
     # SETUP
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
@@ -62,7 +62,7 @@
 
     # TESTS
     - name: Start tests.
-      debug:
+      ansible.builtin.debug:
         msg: "Tests are starting."
 
     - name: Ensure netgroups exist
@@ -203,7 +203,7 @@
       failed_when: result.failed or result.changed
 
     - name: End tests.
-      debug:
+      ansible.builtin.debug:
         msg: "All tests executed."
 
     always: