diff --git a/playbooks/cert/cert-hold.yml b/playbooks/cert/cert-hold.yml
index bd9ab85ab9ce25e62ec635d0bfb0e5138814d9b4..84a6a71150f559f03e121adf79733b3d9bf5e0e8 100644
--- a/playbooks/cert/cert-hold.yml
+++ b/playbooks/cert/cert-hold.yml
@@ -1,3 +1,4 @@
+---
 - name: Certificate manage example
   hosts: ipaserver
   become: false
diff --git a/tests/config/test_config_sid.yml b/tests/config/test_config_sid.yml
index fdae1fba79e2cbf9d7050ac5f8b9625846f7e54d..38840500ddd8c09303f4271b58785bd1ccb9ed60 100644
--- a/tests/config/test_config_sid.yml
+++ b/tests/config/test_config_sid.yml
@@ -30,7 +30,7 @@
       check_mode: yes
       register: sid_disabled
 
-    - name: Ensure netbios_name can't be changed without SID enabled.  # noqa 503
+    - name: Ensure netbios_name can't be changed without SID enabled.  # noqa no-handler
       ipaconfig:
         ipaadmin_password: SomeADMINpassword
         ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -39,7 +39,7 @@
       failed_when: not result.failed and "SID generation must be enabled" in result.msg
       when: sid_disabled.changed
 
-    - name: Ensure SIDs can't be changed without SID enabled.  # noqa 503
+    - name: Ensure SIDs can't be changed without SID enabled.  # noqa no-handler
       ipaconfig:
         ipaadmin_password: SomeADMINpassword
         ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/dnsrecord/test_dnsrecord.yml b/tests/dnsrecord/test_dnsrecord.yml
index b203d366001a48117de2860e24b6f37625c861dd..b7f83d3b9cf992392b58eb1eb99958dce6b23a7b 100644
--- a/tests/dnsrecord/test_dnsrecord.yml
+++ b/tests/dnsrecord/test_dnsrecord.yml
@@ -1549,7 +1549,7 @@
   - name: Cleanup test environment.
     ansible.builtin.include_tasks: env_cleanup.yml
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1]
     become: no
diff --git a/tests/group/test_group.yml b/tests/group/test_group.yml
index 8f6a0fa97f1dab86221d155bdd8745b777b72115..4a26400753afee6abac0625c87a25f55ca11dd30 100644
--- a/tests/group/test_group.yml
+++ b/tests/group/test_group.yml
@@ -283,7 +283,7 @@
       register: result
       failed_when: result.changed or result.failed
 
-    # user
+  # user
 
   - name: Ensure users user1, user2 and user3 are present in group group1
     ipagroup:
diff --git a/tests/group/test_groups_absent.yml b/tests/group/test_groups_absent.yml
index 3238f4e24d1f30c4a17b4448d136b095652028b2..9217abdfe41e2a2f3ce006349cf329c7a8d0fdf2 100644
--- a/tests/group/test_groups_absent.yml
+++ b/tests/group/test_groups_absent.yml
@@ -9,7 +9,7 @@
   tasks:
   - name: Include groups.json
     ansible.builtin.include_vars:
-      file: groups.json  # noqa 505
+      file: groups.json
 
   - name: Initialize groups_names
     ansible.builtin.set_fact:
diff --git a/tests/group/test_groups_present.yml b/tests/group/test_groups_present.yml
index 71ed659d39452f8d56cf62019b7ec5ee98e1e276..d71536fabff8e13b36601514167d5a4d6c3df050 100644
--- a/tests/group/test_groups_present.yml
+++ b/tests/group/test_groups_present.yml
@@ -9,7 +9,7 @@
   tasks:
   - name: Include groups.json
     ansible.builtin.include_vars:
-      file: groups.json  # noqa 505
+      file: groups.json
 
   - name: Groups present len:{{ group_list | length }}
     ipagroup:
diff --git a/tests/group/test_groups_present_slice.yml b/tests/group/test_groups_present_slice.yml
index 3a5593a2fc1e9deea91bb975ad1b53925e839855..f7043d4e0bdc0ae312daa8c9ad4fa0d9de7fea36 100644
--- a/tests/group/test_groups_present_slice.yml
+++ b/tests/group/test_groups_present_slice.yml
@@ -11,7 +11,7 @@
   tasks:
   - name: Include groups.json
     ansible.builtin.include_vars:
-      file: groups.json  # noqa 505
+      file: groups.json
 
   - name: Size of groups slice.
     ansible.builtin.debug:
diff --git a/tests/host/certificate/test_host_certificate.yml b/tests/host/certificate/test_host_certificate.yml
index 33b14291c367bc05064335b2d7db1e18ca29e9ff..fb070dc7e6705360eed12f72c8821da63c9d18b3 100644
--- a/tests/host/certificate/test_host_certificate.yml
+++ b/tests/host/certificate/test_host_certificate.yml
@@ -99,7 +99,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/host/certificate/test_hosts_certificate.yml b/tests/host/certificate/test_hosts_certificate.yml
index dbc0263223eab909d5a0b03724c43470250ad16c..679f5f67e25ecd4cbfb5b6549324ef977e12fd0d 100644
--- a/tests/host/certificate/test_hosts_certificate.yml
+++ b/tests/host/certificate/test_hosts_certificate.yml
@@ -98,7 +98,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/idoverrideuser/test_idoverrideuser.yml b/tests/idoverrideuser/test_idoverrideuser.yml
index 24dfd6c23ce23ca23b7fefcdd6df52b0df81a68a..5ff1da80354ff718fe47ad26952b9c9abd2ed740 100644
--- a/tests/idoverrideuser/test_idoverrideuser.yml
+++ b/tests/idoverrideuser/test_idoverrideuser.yml
@@ -558,7 +558,7 @@
       name: test_idview
       state: absent
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/service/certificate/test_service_certificate.yml b/tests/service/certificate/test_service_certificate.yml
index d5ab12fabaf6ddc5f2a9779f1e45d3e1ffc3c32c..cbc04b432cfa8fac682935e57f4a2e989c8da1a5 100644
--- a/tests/service/certificate/test_service_certificate.yml
+++ b/tests/service/certificate/test_service_certificate.yml
@@ -214,7 +214,7 @@
       update_dns: yes
       state: absent
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2]
diff --git a/tests/service/certificate/test_service_certificate_newline.yml b/tests/service/certificate/test_service_certificate_newline.yml
index 01f7c536d6ab2705510fc42c37d22c6004255e26..927d5037c657ac50dffb60506d4b73d9a8ceea6e 100644
--- a/tests/service/certificate/test_service_certificate_newline.yml
+++ b/tests/service/certificate/test_service_certificate_newline.yml
@@ -192,7 +192,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/service/certificate/test_services_certificate_newline.yml b/tests/service/certificate/test_services_certificate_newline.yml
index 33815a0155e80157b4f06e9253e8f8dd665aab11..5b326524e29cef17cb1557d114a78fab83e4e1d9 100644
--- a/tests/service/certificate/test_services_certificate_newline.yml
+++ b/tests/service/certificate/test_services_certificate_newline.yml
@@ -306,7 +306,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [11, 12, 13, 21, 22, 23, 31, 32, 33]
diff --git a/tests/service/test_service_disable.yml b/tests/service/test_service_disable.yml
index 068fecffd786a8b0bfc9d57b0f79de7af16af612..3152280a8a976f96d920ce79ed751301783a0d32 100644
--- a/tests/service/test_service_disable.yml
+++ b/tests/service/test_service_disable.yml
@@ -100,7 +100,7 @@
   - name: Destroy Kerberos tickets.
     ansible.builtin.shell: kdestroy -A -q -c ${KRB5CCNAME}
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1]
diff --git a/tests/user/certificate/test_user_certificate.yml b/tests/user/certificate/test_user_certificate.yml
index cad033aae40aaf4083ac817754416ef111442403..3f45e9be8b74d2fbb635ccecfd425e37e020e101 100644
--- a/tests/user/certificate/test_user_certificate.yml
+++ b/tests/user/certificate/test_user_certificate.yml
@@ -80,7 +80,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/user/certificate/test_users_certificate.yml b/tests/user/certificate/test_users_certificate.yml
index 55d73e230109f0f0e9ac9cb3de87b395fe188a8e..21b416f219d0d37a17000b9bce609c43fa70caab 100644
--- a/tests/user/certificate/test_users_certificate.yml
+++ b/tests/user/certificate/test_users_certificate.yml
@@ -93,7 +93,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/user/certmapdata/test_user_certmapdata.yml b/tests/user/certmapdata/test_user_certmapdata.yml
index 7bb71ddd9382d3013f2473625a932ccad8d5bb06..7263730916a57ff4ddd90fc0c03abaae04ad3630 100644
--- a/tests/user/certmapdata/test_user_certmapdata.yml
+++ b/tests/user/certmapdata/test_user_certmapdata.yml
@@ -225,7 +225,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.   # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/user/certmapdata/test_users_certmapdata.yml b/tests/user/certmapdata/test_users_certmapdata.yml
index 83a4ce8c4fe8029548ebe4137a325dddedc14667..36c91331526569f3941e93f3f8d1714994e17620 100644
--- a/tests/user/certmapdata/test_users_certmapdata.yml
+++ b/tests/user/certmapdata/test_users_certmapdata.yml
@@ -161,7 +161,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2, 3]
diff --git a/tests/user/test_users_invalid_cert.yml b/tests/user/test_users_invalid_cert.yml
index 50600e697f68a07fb2b68bc44f96283186017bf8..cf9878edcc6b7f01a37479d182cc50148d001ddc 100644
--- a/tests/user/test_users_invalid_cert.yml
+++ b/tests/user/test_users_invalid_cert.yml
@@ -54,7 +54,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Remove certificate files.  # noqa: deprecated-command-syntax
+  - name: Remove certificate files.
     ansible.builtin.shell:
       cmd: rm -f "private{{ item }}.key" "cert{{ item }}.pem" "cert{{ item }}.der" "cert{{ item }}.b64"
     with_items: [1, 2]