diff --git a/playbooks/user/ensure_user_with_randompassword.yml b/playbooks/user/ensure_user_with_randompassword.yml
index ee821f0a01f3a84c53d312bec2632e9a14e28211..6c0f8295ec2cfab3c4fae98e91d8595e3fad8494 100644
--- a/playbooks/user/ensure_user_with_randompassword.yml
+++ b/playbooks/user/ensure_user_with_randompassword.yml
@@ -15,5 +15,5 @@
     register: ipauser
 
   - name: Print generated random password
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.randompassword
diff --git a/playbooks/user/ensure_users_with_randompasswords.yml b/playbooks/user/ensure_users_with_randompasswords.yml
index c03988778685502b56a9d80eb127d001a717a454..17783f5868421e29426d93a2d6568efd7e442a9d 100644
--- a/playbooks/user/ensure_users_with_randompasswords.yml
+++ b/playbooks/user/ensure_users_with_randompasswords.yml
@@ -20,9 +20,9 @@
     register: ipauser
 
   - name: Print generated random password for user1
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.user1.randompassword
 
   - name: Print generated random password for user2
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.user2.randompassword
diff --git a/tests/user/certificate/test_user_certificate.yml b/tests/user/certificate/test_user_certificate.yml
index 09dacbb35e54e66aa1b3693dd8e7b06197e5128b..cad033aae40aaf4083ac817754416ef111442403 100644
--- a/tests/user/certificate/test_user_certificate.yml
+++ b/tests/user/certificate/test_user_certificate.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -81,7 +81,7 @@
     failed_when: not result.changed or result.failed
 
   - name: Remove certificate files.  # noqa: deprecated-command-syntax
-    shell:
+    ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
     become: no
diff --git a/tests/user/certificate/test_users_certificate.yml b/tests/user/certificate/test_users_certificate.yml
index d649f848e6558862f68128f7da23d70949b1efc6..55d73e230109f0f0e9ac9cb3de87b395fe188a8e 100644
--- a/tests/user/certificate/test_users_certificate.yml
+++ b/tests/user/certificate/test_users_certificate.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -94,7 +94,7 @@
     failed_when: not result.changed or result.failed
 
   - name: Remove certificate files.  # noqa: deprecated-command-syntax
-    shell:
+    ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
     become: no
diff --git a/tests/user/certmapdata/test_user_certmapdata.yml b/tests/user/certmapdata/test_user_certmapdata.yml
index 0257b23b4849e352155c88b5fe58adf049a66cba..7bb71ddd9382d3013f2473625a932ccad8d5bb06 100644
--- a/tests/user/certmapdata/test_user_certmapdata.yml
+++ b/tests/user/certmapdata/test_user_certmapdata.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -226,7 +226,7 @@
     failed_when: not result.changed or result.failed
 
   - name: Remove certificate files.   # noqa: deprecated-command-syntax
-    shell:
+    ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
     become: no
diff --git a/tests/user/certmapdata/test_users_certmapdata.yml b/tests/user/certmapdata/test_users_certmapdata.yml
index 491face65ffa79ea2872c6814b523f91e045c40a..83a4ce8c4fe8029548ebe4137a325dddedc14667 100644
--- a/tests/user/certmapdata/test_users_certmapdata.yml
+++ b/tests/user/certmapdata/test_users_certmapdata.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -162,7 +162,7 @@
     failed_when: not result.changed or result.failed
 
   - name: Remove certificate files.  # noqa: deprecated-command-syntax
-    shell:
+    ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
     become: no
diff --git a/tests/user/create_users_json.yml b/tests/user/create_users_json.yml
index f066b0b50853f49c98d2adfb72fe7a76e36d0070..15c3701f3f32e9c0c04287545be2199b404b819e 100644
--- a/tests/user/create_users_json.yml
+++ b/tests/user/create_users_json.yml
@@ -4,10 +4,10 @@
 
   tasks:
   - name: Check if users.json exists
-    stat:
+    ansible.builtin.stat:
       path: users.json
     register: register_stat_users
 
   - name: Create users.json
-    command: /bin/bash users.sh 500
+    ansible.builtin.command: /bin/bash users.sh 500
     when: not register_stat_users.stat.exists
diff --git a/tests/user/test_user_client_context.yml b/tests/user/test_user_client_context.yml
index b4a37a35572fb67ba63a0a6db1ca437de051d7a8..fbb75dbcd8e32d841a179321fffdcf74afb02af3 100644
--- a/tests/user/test_user_client_context.yml
+++ b/tests/user/test_user_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 user using client context, in client host.
-  import_playbook: test_user.yml
+  ansible.builtin.import_playbook: test_user.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test user using client context, in server host.
-  import_playbook: test_user.yml
+  ansible.builtin.import_playbook: test_user.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/user/test_user_random.yml b/tests/user/test_user_random.yml
index ce56abb020048f1a57c3484d2fdf951713e794df..205f057d146d5d76bf0637ff4b79f38bb8e71b2b 100644
--- a/tests/user/test_user_random.yml
+++ b/tests/user/test_user_random.yml
@@ -26,7 +26,7 @@
                  ipauser.failed
 
   - name: Print generated random password
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.randompassword
 
   - name: User user1 absent
@@ -56,11 +56,11 @@
                  ipauser.failed
 
   - name: Print generated random password for user1
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.user1.randompassword
 
   - name: Print generated random password for user2
-    debug:
+    ansible.builtin.debug:
       var: ipauser.user.user2.randompassword
 
   - name: Users user1 and user2 absent
diff --git a/tests/user/test_users_absent.yml b/tests/user/test_users_absent.yml
index 6195374d312807c3b3f886fc35aefc23cdb210fb..23670510ed8cf35b050df6923cb6b34766b5b924 100644
--- a/tests/user/test_users_absent.yml
+++ b/tests/user/test_users_absent.yml
@@ -1,6 +1,6 @@
 ---
 - name: Include create_users_json.yml
-  import_playbook: create_users_json.yml
+  ansible.builtin.import_playbook: create_users_json.yml
 
 - name: Test users absent
   hosts: ipaserver
@@ -9,11 +9,11 @@
 
   tasks:
   - name: Include users.json
-    include_vars:
+    ansible.builtin.include_vars:
       file: users.json  # noqa 505
 
   - name: Create dict with user names
-    set_fact:
+    ansible.builtin.set_fact:
       user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}"
     loop: "{{ users }}"
 
diff --git a/tests/user/test_users_invalid_cert.yml b/tests/user/test_users_invalid_cert.yml
index 50112ce5e14712147ae4a6ab72f5666d3a9af906..50600e697f68a07fb2b68bc44f96283186017bf8 100644
--- a/tests/user/test_users_invalid_cert.yml
+++ b/tests/user/test_users_invalid_cert.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Generate self-signed certificates.
-    shell:
+    ansible.builtin.shell:
       cmd: |
         openssl req -x509 -newkey rsa:2048 -days 365 -nodes -keyout "private{{ item }}.key" -out "cert{{ item }}.pem" -subj '/CN=test'
         openssl x509 -outform der -in "cert{{ item }}.pem" -out "cert{{ item }}.der"
@@ -55,7 +55,7 @@
     failed_when: not result.changed or result.failed
 
   - name: Remove certificate files.  # noqa: deprecated-command-syntax
-    shell:
+    ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2]
     become: no
diff --git a/tests/user/test_users_present.yml b/tests/user/test_users_present.yml
index 75dfdbfd7537245303e0f128b096949d14f60a7a..0a3279fa70d2371d1320f96b5f0b10a68eb8d443 100644
--- a/tests/user/test_users_present.yml
+++ b/tests/user/test_users_present.yml
@@ -1,6 +1,6 @@
 ---
 - name: Include create_users_json.yml
-  import_playbook: create_users_json.yml
+  ansible.builtin.import_playbook: create_users_json.yml
 
 - name: Test users present
   hosts: ipaserver
@@ -9,7 +9,7 @@
 
   tasks:
   - name: Include users.json
-    include_vars:
+    ansible.builtin.include_vars:
       file: users.json  # noqa 505
 
   - name: Users present len:{{ users | length }}
diff --git a/tests/user/test_users_present_slice.yml b/tests/user/test_users_present_slice.yml
index 8f1c6dd4e1a2f16bdfccdaeb15f42cc074673206..904be415ae8c13342a7c0345805807160c0e4900 100644
--- a/tests/user/test_users_present_slice.yml
+++ b/tests/user/test_users_present_slice.yml
@@ -1,6 +1,6 @@
 ---
 - name: Include create_users_json.yml
-  import_playbook: create_users_json.yml
+  ansible.builtin.import_playbook: create_users_json.yml
 
 - name: Test users present slice
   hosts: ipaserver
@@ -11,10 +11,10 @@
     slice_size: 500
   tasks:
   - name: Include users.json
-    include_vars:
+    ansible.builtin.include_vars:
       file: users.json  # noqa 505
   - name: Size of users slice.
-    debug:
+    ansible.builtin.debug:
       msg: "{{ users | length }}"
   - name: Users present
     ipauser: