diff --git a/tests/sudocmd/test_sudocmd_client_context.yml b/tests/sudocmd/test_sudocmd_client_context.yml
index ce8c307d24bf6d53112c77ae062ffc3cc7497392..c10f7ffed268a819e7d2cc1b8a82d9aa65a41922 100644
--- a/tests/sudocmd/test_sudocmd_client_context.yml
+++ b/tests/sudocmd/test_sudocmd_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 sudocmd using client context, in client host.
-  import_playbook: test_sudocmd.yml
+  ansible.builtin.import_playbook: test_sudocmd.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test sudocmd using client context, in server host.
-  import_playbook: test_sudocmd.yml
+  ansible.builtin.import_playbook: test_sudocmd.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/sudocmdgroup/test_sudocmdgroup.yml b/tests/sudocmdgroup/test_sudocmdgroup.yml
index 59f6306167e07621a38f017b3ab558d4947e5147..39f222f888076f5b05b19537a4c640851773e9fa 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup.yml
@@ -83,7 +83,7 @@
     failed_when: result.changed or result.failed
 
   - name: Verify sudocmdgroup creation with sudocmds
-    shell: |
+    ansible.builtin.shell: |
       echo SomeADMINpassword | kinit -c verify_sudocmdgroup admin
       KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all
       kdestroy -A -q -c verify_sudocmdgroup
diff --git a/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml b/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml
index 96d39a83bd7fdc127523e26a388058ddf59c23da..ff4e9c8eb22bf53b36aac36f73ca5e5594c46953 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup_client_context.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup_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 sudocmdgroup using client context, in client host.
-  import_playbook: test_sudocmdgroup.yml
+  ansible.builtin.import_playbook: test_sudocmdgroup.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test sudocmdgroup using client context, in server host.
-  import_playbook: test_sudocmdgroup.yml
+  ansible.builtin.import_playbook: test_sudocmdgroup.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/sudorule/test_sudorule_categories.yml b/tests/sudorule/test_sudorule_categories.yml
index 3b8c1926e1f75ab27e83eb10a34591f3f6d6af8c..5fdf24d9ef9aad392b652a5a014b8a6e70e8622c 100644
--- a/tests/sudorule/test_sudorule_categories.yml
+++ b/tests/sudorule/test_sudorule_categories.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Get Domain from the server name
-    set_fact:
+    ansible.builtin.set_fact:
       ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
 
   - name: Ensure sudorules are absent
diff --git a/tests/sudorule/test_sudorule_client_context.yml b/tests/sudorule/test_sudorule_client_context.yml
index 696cd67014683b1dbc99f45dbd11936de52fbcd0..9df585cb378e779ff1e1aa08728cdaac8c087222 100644
--- a/tests/sudorule/test_sudorule_client_context.yml
+++ b/tests/sudorule/test_sudorule_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 sudorule using client context, in client host.
-  import_playbook: test_sudorule.yml
+  ansible.builtin.import_playbook: test_sudorule.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test sudorule using client context, in server host.
-  import_playbook: test_sudorule.yml
+  ansible.builtin.import_playbook: test_sudorule.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/sudorule/test_sudorule_member_case_insensitive.yml b/tests/sudorule/test_sudorule_member_case_insensitive.yml
index ec1507afa61917d77f16f41e242cd5fcb767561a..724dabda6f44302247ced940f8cfa2f9907c1423 100644
--- a/tests/sudorule/test_sudorule_member_case_insensitive.yml
+++ b/tests/sudorule/test_sudorule_member_case_insensitive.yml
@@ -16,7 +16,7 @@
   - block:
     # SETUP
     - name: Ensure domain name
-      set_fact:
+      ansible.builtin.set_fact:
         ipa_domain: ipa.test
       when: ipa_domain is not defined
 
@@ -56,7 +56,7 @@
 
     # TESTS
     - name: Start tests.
-      debug:
+      ansible.builtin.debug:
         msg: "Tests are starting."
 
     - name: Ensure sudorule exist with runasusers members
@@ -249,7 +249,7 @@
       failed_when: result.failed or result.changed
 
     - name: End tests.
-      debug:
+      ansible.builtin.debug:
         msg: "All tests executed."
 
     always:
diff --git a/tests/sudorule/test_sudorule_single_hostnames.yml b/tests/sudorule/test_sudorule_single_hostnames.yml
index 38ccad9a508216bdfc5c13a39607685610e47990..24acd8b64bdb41c64b1cca9fee0e3f88f25de2ab 100644
--- a/tests/sudorule/test_sudorule_single_hostnames.yml
+++ b/tests/sudorule/test_sudorule_single_hostnames.yml
@@ -8,7 +8,7 @@
   - block:
     # setup test environment
     - name: Get Domain from the server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined