diff --git a/tests/server/test_server.yml b/tests/server/test_server.yml
index 0216cd8c76975e71be172f866c437f8327ed794b..c27da846cd9d6cced8cb989314cff45470f00a36 100644
--- a/tests/server/test_server.yml
+++ b/tests/server/test_server.yml
@@ -9,21 +9,21 @@
   # CLEANUP TEST ITEMS
   - block:
       - name: Get server name from hostname
-        set_fact:
+        ansible.builtin.set_fact:
           ipa_server_name: "{{ ansible_facts['fqdn'].split('.')[0] }}"
     rescue:
       - name: Fallback to 'ipaserver'
-        set_fact:
+        ansible.builtin.set_fact:
           ipa_server_name: ipaserver
     when: ipa_server_name is not defined
 
   - block:
       - name: Get domain name from hostname.
-        set_fact:
+        ansible.builtin.set_fact:
           ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     rescue:
       - name: Fallback to 'ipa.test'
-        set_fact:
+        ansible.builtin.set_fact:
           ipaserver_domain: "ipa.test"
     when: ipaserver_domain is not defined
 
diff --git a/tests/server/test_server_client_context.yml b/tests/server/test_server_client_context.yml
index be7d08f158e6665ac67813bf707846bcb041d75e..6b9b1ca9aa3e8fccf3988c0df63e4b144a41e8c5 100644
--- a/tests/server/test_server_client_context.yml
+++ b/tests/server/test_server_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 server using client context, in client host.
-  import_playbook: test_server.yml
+  ansible.builtin.import_playbook: test_server.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test server using client context, in server host.
-  import_playbook: test_server.yml
+  ansible.builtin.import_playbook: test_server.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client