diff --git a/.ansible-lint b/.ansible-lint
index 3fde5995a71bcbb80ac14562d3bf0f28cb9fb561..abb18e9275d734e4ec3443ffe1d8ddd4d1646bdd 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -33,6 +33,8 @@ skip_list:
   - '305'  # Use shell only when shell functionality is required
   - '306'  # risky-shell-pipe
   - yaml   # yamllint should be executed separately.
+  - experimental   # Do not run any experimental tests
+  - name[template] # Allow Jinja templating inside task names
 
 use_default_rules: true
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index c3b484fa41e756febf9e2d755c123410fcae060e..b4d64066e5a20de2668897066d6c3d1e3dcafc11 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
           pip install "ansible-core >=2.14,<2.15" ansible-lint
           utils/build-galaxy-release.sh -ki
           cd .galaxy-build
-          ansible-lint roles plugins
+          ansible-lint
 
   yamllint:
     name: Verify yamllint
diff --git a/playbooks/config/set-ca-renewal-master-server.yml b/playbooks/config/set-ca-renewal-master-server.yml
index 5e0a1e6a105e0a5312b9a6f30bdab74c005b9eb3..f8187a464240b443ce9ac7d32c55d630f89af086 100644
--- a/playbooks/config/set-ca-renewal-master-server.yml
+++ b/playbooks/config/set-ca-renewal-master-server.yml
@@ -5,7 +5,7 @@
   gather_facts: no
 
   tasks:
-  - name: set ca_renewal_master_server
+  - name: Set ca_renewal_master_server
     ipaconfig:
       ipaadmin_password: SomeADMINpassword
       ca_renewal_master_server: carenewal.example.com
diff --git a/playbooks/dnszone/dnszone-all-params.yml b/playbooks/dnszone/dnszone-all-params.yml
index 79747d2a975b53e4caa9630442294a0f7ceb2c81..5cba47f8b6aa68e5694adb62bd4cd30580e5e1c7 100644
--- a/playbooks/dnszone/dnszone-all-params.yml
+++ b/playbooks/dnszone/dnszone-all-params.yml
@@ -1,5 +1,5 @@
 ---
-- name: dnszone present
+- name: All dnszone parameters
   hosts: ipaserver
   become: true
 
diff --git a/playbooks/dnszone/dnszone-present.yml b/playbooks/dnszone/dnszone-present.yml
index 04d07ba01f26bba153bdc57889bfcf9ace34acc3..9cbeff8ef8d8c6f470aa23a5f739d6ba6561f476 100644
--- a/playbooks/dnszone/dnszone-present.yml
+++ b/playbooks/dnszone/dnszone-present.yml
@@ -1,5 +1,5 @@
 ---
-- name: dnszone present
+- name: Dnszone present
   hosts: ipaserver
   become: true
 
diff --git a/playbooks/trust/add-trust.yml b/playbooks/trust/add-trust.yml
index 9842939a5d4770ff837d48088dfb47def135c348..83b09fe6f7e0a4b7a0295742698570a406230db2 100644
--- a/playbooks/trust/add-trust.yml
+++ b/playbooks/trust/add-trust.yml
@@ -4,7 +4,7 @@
   become: true
 
   tasks:
-    - name: ensure the trust is present
+    - name: Ensure the trust is present
       ipatrust:
         ipaadmin_password: SomeADMINpassword
         realm: windows.local
diff --git a/playbooks/trust/del-trust.yml b/playbooks/trust/del-trust.yml
index 0d0f95f143173918f847b49fef8c47d12837b3a7..2a27d972a7b95df659a38e3226a29d835aa0db58 100644
--- a/playbooks/trust/del-trust.yml
+++ b/playbooks/trust/del-trust.yml
@@ -4,7 +4,7 @@
   become: true
 
   tasks:
-    - name: ensure the trust is absent
+    - name: Ensure the trust is absent
       ipatrust:
         ipaadmin_password: SomeADMINpassword
         realm: windows.local
diff --git a/tests/automember/test_automember_orphans_removed.yml b/tests/automember/test_automember_orphans_removed.yml
index 697f78d418e99a983aef00faa08e1f6f3185ecc2..33d3dc9fdbce63037cc4e44fef162faf4a561cfe 100644
--- a/tests/automember/test_automember_orphans_removed.yml
+++ b/tests/automember/test_automember_orphans_removed.yml
@@ -10,7 +10,7 @@
   - name: Get Domain from server name
     ansible.builtin.set_fact:
       ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] |
-                            join ('.') }}"
+                            join('.') }}"
     when: ipaserver_domain is not defined
 
   # CLEANUP TEST ITEMS
diff --git a/tests/automember/test_automember_rebuilt.yml b/tests/automember/test_automember_rebuilt.yml
index 34b981b78af2948ca3a354a5b7624d619f757afc..6ac865541e17663a6daa6a32d24e66613ea792a5 100644
--- a/tests/automember/test_automember_rebuilt.yml
+++ b/tests/automember/test_automember_rebuilt.yml
@@ -10,7 +10,7 @@
   - name: Get Domain from server name
     ansible.builtin.set_fact:
       ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] |
-                            join ('.') }}"
+                            join('.') }}"
     when: ipaserver_domain is not defined
 
   # CLEANUP TEST ITEMS
diff --git a/tests/automount/test_automountkey.yml b/tests/automount/test_automountkey.yml
index 27ebf30e57fc48403c4ab1b4e3d7564fcf2a0878..a36ef32254c2d2f79206513ba00c1c81f89ac2db 100644
--- a/tests/automount/test_automountkey.yml
+++ b/tests/automount/test_automountkey.yml
@@ -5,18 +5,18 @@
   gather_facts: no
 
   tasks:
-  - name: ensure test location TestLocation is present
+  - name: Ensure test location TestLocation is present
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       name: TestLocation
 
-  - name: ensure test map TestMap is present
+  - name: Ensure test map TestMap is present
     ipaautomountmap:
       ipaadmin_password: SomeADMINpassword
       name: TestMap
       location: TestLocation
 
-  - name: ensure key NewKeyName is absent
+  - name: Ensure key NewKeyName is absent
     ipaautomountkey:
       ipaadmin_password: SomeADMINpassword
       location: TestLocation
@@ -24,7 +24,7 @@
       key: NewKeyName
       state: absent
 
-  - name: ensure key TestKey is absent
+  - name: Ensure key TestKey is absent
     ipaautomountkey:
       ipaadmin_password: SomeADMINpassword
       location: TestLocation
@@ -35,7 +35,7 @@
   - name: Execute Automount Key tests
     block:
     ### test the key creation, and modification
-    - name: ensure key TestKey is present
+    - name: Ensure key TestKey is present
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -46,7 +46,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure key TestKey is present again
+    - name: Ensure key TestKey is present again
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -58,7 +58,7 @@
       failed_when: result.failed or result.changed
 
     ## modify the key
-    - name: ensure key TestKey information has been updated
+    - name: Ensure key TestKey information has been updated
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -69,7 +69,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure key TestKey information has been updated again
+    - name: Ensure key TestKey information has been updated again
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -81,7 +81,7 @@
       failed_when: result.failed or result.changed
 
     ## modify the name
-    - name: ensure key TestKey has been renamed to NewKeyName
+    - name: Ensure key TestKey has been renamed to NewKeyName
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -92,7 +92,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure key TestKey is absent
+    - name: Ensure key TestKey is absent
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -102,7 +102,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure key NewKeyName is present
+    - name: Ensure key NewKeyName is present
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -113,7 +113,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure failure when state is renamed and newname is not set
+    - name: Ensure failure when state is renamed and newname is not set
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -125,7 +125,7 @@
 
     ### cleanup after the tests
     always:
-    - name: ensure key NewKeyName is absent
+    - name: Ensure key NewKeyName is absent
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -133,7 +133,7 @@
         key: NewKeyName
         state: absent
 
-    - name: ensure key TestKey is absent
+    - name: Ensure key TestKey is absent
       ipaautomountkey:
         ipaadmin_password: SomeADMINpassword
         location: TestLocation
@@ -141,14 +141,14 @@
         key: NewKeyName
         state: absent
 
-    - name: ensure map TestMap is absent
+    - name: Ensure map TestMap is absent
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
         location: TestLocation
         state: absent
 
-    - name: ensure location TestLocation is absent
+    - name: Ensure location TestLocation is absent
       ipaautomountlocation:
         ipaadmin_password: SomeADMINpassword
         name: TestLocation
diff --git a/tests/automount/test_automountlocation.yml b/tests/automount/test_automountlocation.yml
index 7e6c3abb9788c18a4b6ae6fd0c772c8f3e8a8fd3..8e652447c7dceec61feb6c4fd356d04a2e290e44 100644
--- a/tests/automount/test_automountlocation.yml
+++ b/tests/automount/test_automountlocation.yml
@@ -5,7 +5,7 @@
   gather_facts: false
 
   tasks:
-  - name: ensure automountlocation TestLocations are absent before testing
+  - name: Ensure automountlocation TestLocations are absent before testing
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -14,7 +14,7 @@
       - TestLocation_02
       state: absent
 
-  - name: ensure empty automountlocation does nothing
+  - name: Ensure empty automountlocation does nothing
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -23,7 +23,7 @@
     register: result
     failed_when: not result.failed or "At least one location must be provided" not in result.msg
 
-  - name: ensure empty automountlocation does nothing on absent
+  - name: Ensure empty automountlocation does nothing on absent
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -32,7 +32,7 @@
     register: result
     failed_when: not result.failed or "At least one location must be provided" not in result.msg
 
-  - name: ensure automountlocation TestLocation is present
+  - name: Ensure automountlocation TestLocation is present
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -41,7 +41,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure automountlocation TestLocation is present again
+  - name: Ensure automountlocation TestLocation is present again
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -50,7 +50,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure automountlocation TestLocation is absent
+  - name: Ensure automountlocation TestLocation is absent
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -59,7 +59,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure automountlocation TestLocation is absent again
+  - name: Ensure automountlocation TestLocation is absent again
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -68,7 +68,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure a list of automountlocations are present
+  - name: Ensure a list of automountlocations are present
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -79,7 +79,7 @@
     register: result
     failed_when: result.failed or not result.changed
 
-  - name: ensure a list of automountlocations exist
+  - name: Ensure a list of automountlocations exist
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -90,7 +90,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure a list of automountlocations are absent
+  - name: Ensure a list of automountlocations are absent
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -101,7 +101,7 @@
     register: result
     failed_when: result.failed or not result.changed
 
-  - name: ensure multiple automountlocations are absent
+  - name: Ensure multiple automountlocations are absent
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/automount/test_automountmap.yml b/tests/automount/test_automountmap.yml
index 417c9fd4bf2c03fbf813d6d578e13b3ecba0667f..1fc72acc49a93ff8e27259b1f4bdcfed3a0ca51c 100644
--- a/tests/automount/test_automountmap.yml
+++ b/tests/automount/test_automountmap.yml
@@ -6,7 +6,7 @@
 
   tasks:
   # setup environment
-  - name: ensure test maps are absent
+  - name: Ensure test maps are absent
     ipaautomountmap:
       ipaadmin_password: SomeADMINpassword
       name:
@@ -15,20 +15,20 @@
       location: TestLocation
       state: absent
 
-  - name: ensure location TestLocation is absent
+  - name: Ensure location TestLocation is absent
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       name: TestLocation
       state: absent
 
-  - name: ensure map TestMap is absent
+  - name: Ensure map TestMap is absent
     ipaautomountmap:
       ipaadmin_password: SomeADMINpassword
       name: TestMap
       location: TestLocation
       state: absent
 
-  - name: ensure location TestLocation is present
+  - name: Ensure location TestLocation is present
     ipaautomountlocation:
       ipaadmin_password: SomeADMINpassword
       name: TestLocation
@@ -37,7 +37,7 @@
   # TESTS
   - name: Execute Automount Map tests
     block:
-    - name: ensure map TestMap is present
+    - name: Ensure map TestMap is present
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -46,7 +46,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure map TestMap is present again
+    - name: Ensure map TestMap is present again
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -54,7 +54,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure map TestMap has a different description
+    - name: Ensure map TestMap has a different description
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -63,7 +63,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure map TestMap has a different description, again
+    - name: Ensure map TestMap has a different description, again
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -72,7 +72,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure map TestMap has an empty description
+    - name: Ensure map TestMap has an empty description
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -81,7 +81,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure map TestMap has an empty description, again
+    - name: Ensure map TestMap has an empty description, again
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -90,7 +90,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure map TestMap is removed
+    - name: Ensure map TestMap is removed
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -99,7 +99,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure map TestMap has been removed
+    - name: Ensure map TestMap has been removed
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap
@@ -108,7 +108,7 @@
       register: result
       failed_when: result.failed or result.changed
 
-    - name: ensure map TestMap01 is present
+    - name: Ensure map TestMap01 is present
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap01
@@ -117,7 +117,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure map TestMap02 is present
+    - name: Ensure map TestMap02 is present
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name: TestMap02
@@ -126,7 +126,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure TestMap01 and TestMap02 are both absent
+    - name: Ensure TestMap01 and TestMap02 are both absent
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name:
@@ -137,7 +137,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: ensure TestMap01 and TestMap02 are both absent again
+    - name: Ensure TestMap01 and TestMap02 are both absent again
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name:
@@ -150,7 +150,7 @@
 
     # CLEAN UP
     always:
-    - name: ensure test maps are absent
+    - name: Ensure test maps are absent
       ipaautomountmap:
         ipaadmin_password: SomeADMINpassword
         name:
@@ -159,7 +159,7 @@
         location: TestLocation
         state: absent
 
-    - name: ensure location TestLocation is absent
+    - name: Ensure location TestLocation is absent
       ipaautomountlocation:
         ipaadmin_password: SomeADMINpassword
         name: TestLocation
diff --git a/tests/backup_role/test_backup.yml b/tests/backup_role/test_backup.yml
index 9f68656f0948ff5ebadcc43387dd3dcb4b1b30e3..9bcefa1bb0443d2093a53646109223f976b0e026 100644
--- a/tests/backup_role/test_backup.yml
+++ b/tests/backup_role/test_backup.yml
@@ -174,7 +174,7 @@
     become: no
 
   # Copy all backups from server
-  - name: list all existing backups on server
+  - name: List all existing backups on server
     ansible.builtin.find:
       path: /var/lib/ipa/backup
       recurse: no
@@ -305,7 +305,7 @@
     become: no
 
   # Remove all backups from server
-  - name: list all existing backups on server
+  - name: List all existing backups on server
     ansible.builtin.find:
       path: /var/lib/ipa/backup
       recurse: no
@@ -320,7 +320,7 @@
       state: absent
       ipabackup_name: all
 
-  - name: list all existing backups on server
+  - name: List all existing backups on server
     ansible.builtin.find:
       path: /var/lib/ipa/backup
       recurse: no
@@ -342,7 +342,7 @@
       state: absent
       ipabackup_name: all
 
-  - name: list all existing backups on server
+  - name: List all existing backups on server
     ansible.builtin.find:
       path: /var/lib/ipa/backup
       recurse: no
diff --git a/tests/ca-less/install_replica_without_ca.yml b/tests/ca-less/install_replica_without_ca.yml
index 676083129a5643ff1f69b3555ecacd26a6bd8ad7..4e6952bb71ee0d78801123c8081485f20e3d8968 100644
--- a/tests/ca-less/install_replica_without_ca.yml
+++ b/tests/ca-less/install_replica_without_ca.yml
@@ -9,7 +9,7 @@
       /bin/bash
       generate-certificates.sh create
       "{{ groups.ipareplicas[0] }}"
-      "{{ ipareplica_domain | default(groups.ipareplicas[0].split('.')[1:] | join ('.')) }}"
+      "{{ ipareplica_domain | default(groups.ipareplicas[0].split('.')[1:] | join('.')) }}"
     args:
       chdir: "{{ playbook_dir }}"
 
diff --git a/tests/ca-less/install_server_without_ca.yml b/tests/ca-less/install_server_without_ca.yml
index a29cb0c231d078c08f156eb0c17f64c6b3308e69..c5206e1aace429d4613d105280c364499c20a06b 100644
--- a/tests/ca-less/install_server_without_ca.yml
+++ b/tests/ca-less/install_server_without_ca.yml
@@ -9,7 +9,7 @@
       /bin/bash
       generate-certificates.sh create
       "{{ groups.ipaserver[0] }}"
-      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join ('.')) }}"
+      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join('.')) }}"
     args:
       chdir: "{{ playbook_dir }}"
 
diff --git a/tests/config/test_config.yml b/tests/config/test_config.yml
index 8cadafba4579b3f9fd88dbd2caf3c3f0b0706c84..ced34211ca312019b1f52a7ae40670e69eb02562 100644
--- a/tests/config/test_config.yml
+++ b/tests/config/test_config.yml
@@ -11,7 +11,7 @@
   - name: Execute config tests
     block:
       # Retrieve current configuration.
-      - name: return current values of the global configuration options
+      - name: Return current values of the global configuration options
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -22,7 +22,7 @@
           var: previousconfig
 
       # setup environment.
-      - name: create test group
+      - name: Create test group
         ipagroup:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -34,25 +34,25 @@
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           emaildomain: ipa.test
 
-      - name: set default shell to '/bin/sh'
+      - name: Set default shell to '/bin/sh'
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           defaultshell: /bin/sh
 
-      - name: set default group
+      - name: Set default group
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           defaultgroup: ipausers
 
-      - name: set default home directory
+      - name: Set default home directory
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           homedirectory: /home
 
-      - name: clear pac-type
+      - name: Clear pac-type
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -60,68 +60,68 @@
 
       - name: Execute tests if ipa_version >= 4.8.0
         block:
-          - name: set maxhostname to 255
+          - name: Set maxhostname to 255
             ipaconfig:
               ipaadmin_password: SomeADMINpassword
               ipaapi_context: "{{ ipa_context | default(omit) }}"
               maxhostname: 255
         when: ipa_version is version('4.8.0', '>=')
 
-      - name: set maxusername to 45
+      - name: Set maxusername to 45
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           maxusername: 45
 
-      - name: set pwdexpnotify to 0
+      - name: Set pwdexpnotify to 0
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           pwdexpnotify: 0
 
-      - name: set searchrecordslimit to 10
+      - name: Set searchrecordslimit to 10
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           searchrecordslimit: 10
 
-      - name: set searchtimelimit to 1
+      - name: Set searchtimelimit to 1
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           searchtimelimit: 1
 
-      - name: clear configstring
+      - name: Clear configstring
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           configstring: ""
 
-      - name: set configstring to AllowNThash
+      - name: Set configstring to AllowNThash
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           configstring: 'KDC:Disable Lockout'
 
-      - name: set selinuxusermapdefault
+      - name: Set selinuxusermapdefault
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           selinuxusermapdefault: "staff_u:s0-s0:c0.c1023"
 
-      - name: set selinuxusermaporder
+      - name: Set selinuxusermaporder
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           selinuxusermaporder: 'user_u:s0$staff_u:s0-s0:c0.c1023'
 
-      - name: set usersearch to `uid`
+      - name: Set usersearch to `uid`
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
           usersearch: uid
 
-      - name: set groupsearch to `cn`
+      - name: Set groupsearch to `cn`
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -144,7 +144,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set default shell to '/bin/someshell'
+      - name: Set default shell to '/bin/someshell'
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -152,7 +152,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set default shell to '/bin/someshell', again.
+      - name: Set default shell to '/bin/someshell', again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -160,7 +160,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set default group
+      - name: Set default group
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -168,7 +168,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set default group, again
+      - name: Set default group, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -176,7 +176,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set default home directory
+      - name: Set default home directory
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -184,7 +184,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set default home directory, again
+      - name: Set default home directory, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -192,7 +192,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set pac-type
+      - name: Set pac-type
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -200,7 +200,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set pac-type, again.
+      - name: Set pac-type, again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -208,7 +208,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set maxusername to 33
+      - name: Set maxusername to 33
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -216,7 +216,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set maxusername to 33, again.
+      - name: Set maxusername to 33, again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -226,7 +226,7 @@
 
       - name: Execute tests if ipa_version >= 4.8.0
         block:
-          - name: set maxhostname to 77
+          - name: Set maxhostname to 77
             ipaconfig:
               ipaadmin_password: SomeADMINpassword
               ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -234,7 +234,7 @@
             register: result
             failed_when: not result.changed or result.failed
 
-          - name: set maxhostname to 77, again
+          - name: Set maxhostname to 77, again
             ipaconfig:
               ipaadmin_password: SomeADMINpassword
               ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -243,7 +243,7 @@
             failed_when: result.changed or result.failed
         when: ipa_version is version('4.8.0', '>=')
 
-      - name: set pwdexpnotify to 17
+      - name: Set pwdexpnotify to 17
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -251,7 +251,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set pwdexpnotify to 17, again
+      - name: Set pwdexpnotify to 17, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -259,7 +259,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set searchrecordslimit to -1
+      - name: Set searchrecordslimit to -1
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -267,7 +267,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set searchrecordslimit to -1, again.
+      - name: Set searchrecordslimit to -1, again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -275,7 +275,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set searchtimelimit to 12345
+      - name: Set searchtimelimit to 12345
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -283,7 +283,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set searchtimelimit to 12345, again.
+      - name: Set searchtimelimit to 12345, again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -291,7 +291,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: change enable_migration
+      - name: Change enable_migration
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -299,7 +299,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: change enable_migration, again
+      - name: Change enable_migration, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -307,7 +307,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set configstring to AllowNThash
+      - name: Set configstring to AllowNThash
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -315,7 +315,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set configstring to AllowNThash, again.
+      - name: Set configstring to AllowNThash, again.
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -323,7 +323,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set selinuxusermaporder
+      - name: Set selinuxusermaporder
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -331,7 +331,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set selinuxusermaporder, again
+      - name: Set selinuxusermaporder, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -339,7 +339,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set selinuxusermapdefault
+      - name: Set selinuxusermapdefault
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -347,7 +347,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set selinuxusermapdefault, again
+      - name: Set selinuxusermapdefault, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -355,7 +355,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set groupsearch to `description`
+      - name: Set groupsearch to `description`
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -363,7 +363,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set groupsearch to `gidNumber`, again
+      - name: Set groupsearch to `gidNumber`, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -371,7 +371,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: set usersearch to `uidNumber`
+      - name: Set usersearch to `uidNumber`
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -379,7 +379,7 @@
         register: result
         failed_when: not result.changed or result.failed
 
-      - name: set usersearch to `uidNumber`, again
+      - name: Set usersearch to `uidNumber`, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -387,7 +387,7 @@
         register: result
         failed_when: result.changed or result.failed
 
-      - name: reset changed fields
+      - name: Reset changed fields
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -416,14 +416,14 @@
 
       - name: Execute tests if ipa_version >= 4.8.0
         block:
-          - name: reset maxhostname
+          - name: Reset maxhostname
             ipaconfig:
               ipaadmin_password: SomeADMINpassword
               ipaapi_context: "{{ ipa_context | default(omit) }}"
               maxhostname: '{{ previousconfig.config.maxhostname | default(omit) }}'
         when: ipa_version is version('4.8.0', '>=')
 
-      - name: reset changed fields, again
+      - name: Reset changed fields, again
         ipaconfig:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -452,7 +452,7 @@
 
       - name: Execute tests if ipa_version >= 4.8.0
         block:
-          - name: reset maxhostname
+          - name: Reset maxhostname
             ipaconfig:
               ipaadmin_password: SomeADMINpassword
               ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -492,7 +492,7 @@
 
     always:
       # cleanup
-      - name: cleanup test group
+      - name: Cleanup test group
         ipagroup:
           ipaadmin_password: SomeADMINpassword
           ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/dnsforwardzone/test_dnsforwardzone.yml b/tests/dnsforwardzone/test_dnsforwardzone.yml
index 260829ff576607e021da2fb91784ed07fc00f5b1..43c0f1417cf0dc7ab538f88063984abb3061955d 100644
--- a/tests/dnsforwardzone/test_dnsforwardzone.yml
+++ b/tests/dnsforwardzone/test_dnsforwardzone.yml
@@ -5,7 +5,7 @@
   gather_facts: false
 
   tasks:
-  - name: ensure test forwardzones are absent
+  - name: Ensure test forwardzones are absent
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -14,7 +14,7 @@
       - newfailzone.com
       state: absent
 
-  - name: ensure forwardzone example.com is created
+  - name: Ensure forwardzone example.com is created
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -27,7 +27,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure forwardzone example.com is present again
+  - name: Ensure forwardzone example.com is present again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -40,7 +40,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure forwardzone example.com has two forwarders
+  - name: Ensure forwardzone example.com has two forwarders
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -55,7 +55,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure forwardzone example.com has one forwarder again
+  - name: Ensure forwardzone example.com has one forwarder again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -68,7 +68,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: skip_overlap_check can only be set on creation so change nothing
+  - name: Skip_overlap_check can only be set on creation so change nothing
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -81,7 +81,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure forwardzone example.com is absent.
+  - name: Ensure forwardzone example.com is absent.
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -90,7 +90,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure forwardzone example.com is absent, again.
+  - name: Ensure forwardzone example.com is absent, again.
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -99,7 +99,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: change all the things at once
+  - name: Change all the things at once
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -115,7 +115,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: change zone forward policy
+  - name: Change zone forward policy
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -124,7 +124,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: change zone forward policy, again
+  - name: Change zone forward policy, again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -133,7 +133,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure forwardzone example.com is absent.
+  - name: Ensure forwardzone example.com is absent.
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -142,7 +142,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure forwardzone example.com is absent, again.
+  - name: Ensure forwardzone example.com is absent, again.
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -151,7 +151,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure forwardzone example.com is created with minimal args
+  - name: Ensure forwardzone example.com is created with minimal args
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -163,7 +163,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: ensure forwardzone example.com is created with minimal args, again
+  - name: Ensure forwardzone example.com is created with minimal args, again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -175,7 +175,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: add a forwarder to any existing ones
+  - name: Add a forwarder to any existing ones
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -188,7 +188,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: add a forwarder to any existing ones, again
+  - name: Add a forwarder to any existing ones, again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -201,7 +201,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: check the list of forwarders is what we expect
+  - name: Check the list of forwarders is what we expect
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -215,7 +215,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: remove a single forwarder
+  - name: Remove a single forwarder
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -227,7 +227,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: remove a single forwarder, again
+  - name: Remove a single forwarder, again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -239,7 +239,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: check the list of forwarders is what we expect now
+  - name: Check the list of forwarders is what we expect now
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -292,7 +292,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: disable the forwarder
+  - name: Disable the forwarder
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -301,7 +301,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: disable the forwarder again
+  - name: Disable the forwarder again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -310,7 +310,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: enable the forwarder
+  - name: Enable the forwarder
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -319,7 +319,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: enable the forwarder, again
+  - name: Enable the forwarder, again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -328,14 +328,14 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: ensure forwardzone example.com is absent again
+  - name: Ensure forwardzone example.com is absent again
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
       name: example.com
       state: absent
 
-  - name: try to create a new forwarder with action=member
+  - name: Try to create a new forwarder with action=member
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -349,7 +349,7 @@
     register: result
     failed_when: not result.failed or "not found" not in result.msg
 
-  - name: try to create a new forwarder with disabled state
+  - name: Try to create a new forwarder with disabled state
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -366,7 +366,7 @@
     register: result
     failed_when: not result.failed or "No forwarders specified" not in result.msg
 
-  - name: ensure forwardzone example.com is absent - tidy up
+  - name: Ensure forwardzone example.com is absent - tidy up
     ipadnsforwardzone:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/dnsrecord/env_vars.yml b/tests/dnsrecord/env_vars.yml
index dfa7a8cddb7c351c4ad4b3f6b3be7dac9ff302bf..c2e180bcc36c70d109854735f249da5e74c9b56d 100644
--- a/tests/dnsrecord/env_vars.yml
+++ b/tests/dnsrecord/env_vars.yml
@@ -15,6 +15,6 @@
     zone_ipv6_reverse: "ip6.arpa."
     zone_ipv6_reverse_workaround: "d.f.ip6.arpa."
     zone_prefix_reverse: "in-addr.arpa."
-    zone_prefix_reverse_24: "{{ ipv4_reverse.split('.')[:] | join ('.') }}.in-addr.arpa."
-    zone_prefix_reverse_16: "{{ ipv4_reverse.split('.')[1:] | join ('.') }}.in-addr.arpa."
-    zone_prefix_reverse_8: "{{ ipv4_reverse.split('.')[2:] | join ('.') }}.in-addr.arpa."
+    zone_prefix_reverse_24: "{{ ipv4_reverse.split('.')[:] | join('.') }}.in-addr.arpa."
+    zone_prefix_reverse_16: "{{ ipv4_reverse.split('.')[1:] | join('.') }}.in-addr.arpa."
+    zone_prefix_reverse_8: "{{ ipv4_reverse.split('.')[2:] | join('.') }}.in-addr.arpa."
diff --git a/tests/env_freeipa_facts.yml b/tests/env_freeipa_facts.yml
index e407c0de5f7fbd84438cf407cfd9c2ed9303d51f..d6f65f3b0d80b830da1ad0d511c993c6ea7aaecc 100644
--- a/tests/env_freeipa_facts.yml
+++ b/tests/env_freeipa_facts.yml
@@ -34,7 +34,7 @@
   block:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: "'fqdn' in ansible_facts"
 
   - name: Set Domain to 'ipa.test' if FQDN could not be retrieved.
diff --git a/tests/external-signed-ca-with-automatic-copy/install-server-with-external-ca-with-automatic-copy.yml b/tests/external-signed-ca-with-automatic-copy/install-server-with-external-ca-with-automatic-copy.yml
index 0e668a8a82abe4a07ad50790461c98a5fae0cbcd..08427b2499e91a820a9eec6088f4e74953b59742 100644
--- a/tests/external-signed-ca-with-automatic-copy/install-server-with-external-ca-with-automatic-copy.yml
+++ b/tests/external-signed-ca-with-automatic-copy/install-server-with-external-ca-with-automatic-copy.yml
@@ -19,7 +19,7 @@
       /bin/bash
       external-ca.sh
       "{{ groups.ipaserver[0] }}"
-      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join ('.')) }}"
+      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join('.')) }}"
     args:
       chdir: "{{ playbook_dir }}"
 
diff --git a/tests/external-signed-ca-with-manual-copy/install-server-with-external-ca-with-manual-copy.yml b/tests/external-signed-ca-with-manual-copy/install-server-with-external-ca-with-manual-copy.yml
index 564ea167350b17fa722a4cc959423e4d3d2532c9..39b9ac74ec79bd2aa3d21701a40d7967b51b550e 100644
--- a/tests/external-signed-ca-with-manual-copy/install-server-with-external-ca-with-manual-copy.yml
+++ b/tests/external-signed-ca-with-manual-copy/install-server-with-external-ca-with-manual-copy.yml
@@ -25,7 +25,7 @@
       /bin/bash
       external-ca.sh
       "{{ groups.ipaserver[0] }}"
-      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join ('.')) }}"
+      "{{ ipaserver_domain | default(groups.ipaserver[0].split('.')[1:] | join('.')) }}"
     args:
       chdir: "{{ playbook_dir }}"
 
diff --git a/tests/group/test_group_external_members.yml b/tests/group/test_group_external_members.yml
index 559408a83fadcf1ee3e6ea0c8b63c381aad91d6f..db926cf44e92d53051b56c9722902a362e7e3d95 100644
--- a/tests/group/test_group_external_members.yml
+++ b/tests/group/test_group_external_members.yml
@@ -1,5 +1,5 @@
 ---
-- name: find trust
+- name: Find trust
   hosts: ipaserver
   become: true
   gather_facts: false
diff --git a/tests/group/test_group_idoverrideuser.yml b/tests/group/test_group_idoverrideuser.yml
index e468b88b446404f0c77fedfe501621239270c79c..71d640a688f9868d368d281a69a53c0974eb7a46 100644
--- a/tests/group/test_group_idoverrideuser.yml
+++ b/tests/group/test_group_idoverrideuser.yml
@@ -103,4 +103,4 @@
           kdestroy -A -q -c idoverride_cache
         when:
 
-      when: ipa_version is version("4.8.7", ">=")  and trust_test_is_supported | default(false)
+      when: ipa_version is version("4.8.7", ">=") and trust_test_is_supported | default(false)
diff --git a/tests/hbacrule/test_hbacrule.yml b/tests/hbacrule/test_hbacrule.yml
index 7699360e9c30e9a84deccdbfa193a0fd2445d23d..ac12b8cf99f670874564dee05303abf31c7e800b 100644
--- a/tests/hbacrule/test_hbacrule.yml
+++ b/tests/hbacrule/test_hbacrule.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   # CLEANUP TEST ITEMS
diff --git a/tests/hbacrule/test_hbacrule_member_case_insensitive.yml b/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
index 160f871315c7ab3d4f159e0fe3d7dddef2fbfc1a..e37163de7880e4d7d88bac002b5f8c02cde83c90 100644
--- a/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
+++ b/tests/hbacrule/test_hbacrule_member_case_insensitive.yml
@@ -193,7 +193,7 @@
           - "{{ hbacsvc_list[0] | upper }}"
           - "{{ hbacsvc_list[1] | upper }}"
           hbacsvcgroup:
-          - "{{ hbacsvcgroup_list[0] | upper  }}"
+          - "{{ hbacsvcgroup_list[0] | upper }}"
         register: result
         failed_when: result.changed or result.failed
 
diff --git a/tests/hbacrule/test_hbacrule_member_empty.yml b/tests/hbacrule/test_hbacrule_member_empty.yml
index 2f0c64ef40dd3cd60c7a890f398c8f740320a270..ce02e61d8c62ff9bc6d113b85f10e5057f617e29 100644
--- a/tests/hbacrule/test_hbacrule_member_empty.yml
+++ b/tests/hbacrule/test_hbacrule_member_empty.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Test hbacrule member empty
diff --git a/tests/host/certificate/test_host_certificate.yml b/tests/host/certificate/test_host_certificate.yml
index 62c047e84ac9a61d99f92eae46d0f08c831dc2c8..33b14291c367bc05064335b2d7db1e18ca29e9ff 100644
--- a/tests/host/certificate/test_host_certificate.yml
+++ b/tests/host/certificate/test_host_certificate.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Generate self-signed certificates.
diff --git a/tests/host/certificate/test_hosts_certificate.yml b/tests/host/certificate/test_hosts_certificate.yml
index 3e8779b1d5ebb9cc7c57eafe13fe74e88f8ebb03..dbc0263223eab909d5a0b03724c43470250ad16c 100644
--- a/tests/host/certificate/test_hosts_certificate.yml
+++ b/tests/host/certificate/test_hosts_certificate.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Host test absent
diff --git a/tests/host/test_host.yml b/tests/host/test_host.yml
index ac62b71e247d3019e6f81af8fd0d750fd8bf0e21..f41560df8bfdd43e86fa2a19629284fc84d685c1 100644
--- a/tests/host/test_host.yml
+++ b/tests/host/test_host.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host6_fqdn
diff --git a/tests/host/test_host_allow_create_keytab.yml b/tests/host/test_host_allow_create_keytab.yml
index ee2da2f6fb17f6cf473dbead670de85589ae2ba6..53ceb8b030c67c6061671b5a541effab135bcd28 100644
--- a/tests/host/test_host_allow_create_keytab.yml
+++ b/tests/host/test_host_allow_create_keytab.yml
@@ -6,12 +6,12 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Get Realm from server name
     ansible.builtin.set_fact:
-      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') | upper }}"
+      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') | upper }}"
     when: ipaserver_realm is not defined
 
   - name: Set host1_fqdn .. host3_fqdn
diff --git a/tests/host/test_host_allow_retrieve_keytab.yml b/tests/host/test_host_allow_retrieve_keytab.yml
index 13af3d0165bfe3269c2ace28149bd465b33d245c..f287d5da22581137ac23fa856502d9286e0f19aa 100644
--- a/tests/host/test_host_allow_retrieve_keytab.yml
+++ b/tests/host/test_host_allow_retrieve_keytab.yml
@@ -6,12 +6,12 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Get Realm from server name
     ansible.builtin.set_fact:
-      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') | upper }}"
+      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') | upper }}"
     when: ipaserver_realm is not defined
 
   - name: Set host1_fqdn .. host3_fqdn
diff --git a/tests/host/test_host_bool_params.yml b/tests/host/test_host_bool_params.yml
index e5d4dfd03f05804e585878c92b7b3d143a0d7e29..1c8af031a2be45c9ebdfdf7cc5efd5a126a8c61d 100644
--- a/tests/host/test_host_bool_params.yml
+++ b/tests/host/test_host_bool_params.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host6_fqdn
diff --git a/tests/host/test_host_empty_string_params.yml b/tests/host/test_host_empty_string_params.yml
index 1103b0f82a85c6d212660f77cc14177e2f0a7afa..1e30f5e6efc57f855147492d1a7b9c90c82e2508 100644
--- a/tests/host/test_host_empty_string_params.yml
+++ b/tests/host/test_host_empty_string_params.yml
@@ -7,7 +7,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host6_fqdn
diff --git a/tests/host/test_host_ipaddresses.yml b/tests/host/test_host_ipaddresses.yml
index e85916178e9ca58d7d823aede2e5201a02b0ab88..01d321f77680dbaa87d5a7574eda46b768aaf020 100644
--- a/tests/host/test_host_ipaddresses.yml
+++ b/tests/host/test_host_ipaddresses.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host6_fqdn
diff --git a/tests/host/test_host_managedby_host.yml b/tests/host/test_host_managedby_host.yml
index 36551d02c40f5d1ffe75feded2e3091e43116bb5..60f97990b9b660d2a1d677fa5c65791073a489a3 100644
--- a/tests/host/test_host_managedby_host.yml
+++ b/tests/host/test_host_managedby_host.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host2_fqdn
diff --git a/tests/host/test_host_principal.yml b/tests/host/test_host_principal.yml
index 1f6dbb151527428401f9d8a120c8ff0b7ce2d33a..d8ef243dcc820ac1fbf2cbef2892ebea9ea7d9a0 100644
--- a/tests/host/test_host_principal.yml
+++ b/tests/host/test_host_principal.yml
@@ -6,12 +6,12 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Get Realm from server name
     ansible.builtin.set_fact:
-      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') | upper }}"
+      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') | upper }}"
     when: ipaserver_realm is not defined
 
   - name: Set host1_fqdn
diff --git a/tests/host/test_host_random.yml b/tests/host/test_host_random.yml
index 1f49b43e0cc1276c4b032fe3a4a961bf8b73161a..17692167fdac6b2ec5d7518258d7cc4fbf75d689 100644
--- a/tests/host/test_host_random.yml
+++ b/tests/host/test_host_random.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn and host2_fqdn
diff --git a/tests/host/test_host_reverse.yml b/tests/host/test_host_reverse.yml
index 27c64328726fce9099f74e46e3185c5b523ee62b..1b05d071ca7e2c6a97d92bb50c9abf8027c356e2 100644
--- a/tests/host/test_host_reverse.yml
+++ b/tests/host/test_host_reverse.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn
@@ -31,9 +31,9 @@
       zone_ipv6_reverse: "ip6.arpa."
       zone_ipv6_reverse_workaround: "d.f.ip6.arpa."
       zone_prefix_reverse: "in-addr.arpa"
-      zone_prefix_reverse_8: "{{ ipv4_prefix.split('.')[2::-1] | join ('.') }}.in-addr.arpa"
-      zone_prefix_reverse_16: "{{ ipv4_prefix.split('.')[1::-1] | join ('.') }}.in-addr.arpa"
-      zone_prefix_reverse_24: "{{ ipv4_prefix.split('.')[::-1] | join ('.') }}.in-addr.arpa"
+      zone_prefix_reverse_8: "{{ ipv4_prefix.split('.')[2::-1] | join('.') }}.in-addr.arpa"
+      zone_prefix_reverse_16: "{{ ipv4_prefix.split('.')[1::-1] | join('.') }}.in-addr.arpa"
+      zone_prefix_reverse_24: "{{ ipv4_prefix.split('.')[::-1] | join('.') }}.in-addr.arpa"
 
   - name: Set zone for reverse address.
     ipadnszone:
diff --git a/tests/host/test_host_sshpubkey.yml b/tests/host/test_host_sshpubkey.yml
index 7bf0da164fc3df96f44eca9ca944a6ec487754e8..388a22a81c064d1da08645223d1f1dbc62b68f67 100644
--- a/tests/host/test_host_sshpubkey.yml
+++ b/tests/host/test_host_sshpubkey.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn
diff --git a/tests/host/test_hosts.yml b/tests/host/test_hosts.yml
index d462bd47e80a99483cd4f23cfc4cbdbd0d2a79dc..80a94824e2d1879c62c8d45ad1139521589580ac 100644
--- a/tests/host/test_hosts.yml
+++ b/tests/host/test_hosts.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host6_fqdn
diff --git a/tests/host/test_hosts_managedby_host.yml b/tests/host/test_hosts_managedby_host.yml
index ec0208a5285648f482df12ff164f45b2ec6b2bb4..3ce62731a82902026f8ea77be403a371cc0c0436 100644
--- a/tests/host/test_hosts_managedby_host.yml
+++ b/tests/host/test_hosts_managedby_host.yml
@@ -6,7 +6,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Set host1_fqdn .. host5_fqdn
diff --git a/tests/host/test_hosts_principal.yml b/tests/host/test_hosts_principal.yml
index 77fee9e3a5399d9374fce1692bccc93928fd54eb..3df584f60c2a3287084f78314727901613fbeeba 100644
--- a/tests/host/test_hosts_principal.yml
+++ b/tests/host/test_hosts_principal.yml
@@ -6,12 +6,12 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Get Realm from server name
     ansible.builtin.set_fact:
-      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') | upper }}"
+      ipaserver_realm: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') | upper }}"
     when: ipaserver_realm is not defined
 
   - name: Set host1_fqdn .. host2_fqdn
diff --git a/tests/hostgroup/test_hostgroup.yml b/tests/hostgroup/test_hostgroup.yml
index b667d56ad66b6662bb110f95803d943090225d71..c71a96d57d5d9c89dd1cec39d800f7fc78b11769 100644
--- a/tests/hostgroup/test_hostgroup.yml
+++ b/tests/hostgroup/test_hostgroup.yml
@@ -7,7 +7,7 @@
   tasks:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Ensure host-group databases, mysql-server and oracle-server are absent
diff --git a/tests/netgroup/test_netgroup.yml b/tests/netgroup/test_netgroup.yml
index 4802bd482b54fb088a38ea1aba90929f462fb4e7..daf2b660aa8adb62fe59dc2b18ea43bd3a74e35e 100644
--- a/tests/netgroup/test_netgroup.yml
+++ b/tests/netgroup/test_netgroup.yml
@@ -29,7 +29,7 @@
     # CREATE TEST ITEMS
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Ensure netgroup my_netgroup2 is present
diff --git a/tests/netgroup/test_netgroup_member.yml b/tests/netgroup/test_netgroup_member.yml
index 20cde4721ac2579a8178ab89818efea5a271255f..453564bbda0bbfd26e605ca5f2c09bbe86a6f073 100644
--- a/tests/netgroup/test_netgroup_member.yml
+++ b/tests/netgroup/test_netgroup_member.yml
@@ -9,7 +9,7 @@
     block:
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Set host1_fqdn .. host2_fqdn
diff --git a/tests/netgroup/test_netgroup_member_absent.yml b/tests/netgroup/test_netgroup_member_absent.yml
index 9ee1d13d79feded2524a33307e62222546007750..45aa71ed0292efffdf7030497c63ac8f520672ed 100644
--- a/tests/netgroup/test_netgroup_member_absent.yml
+++ b/tests/netgroup/test_netgroup_member_absent.yml
@@ -9,7 +9,7 @@
     block:
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Set host1_fqdn .. host2_fqdn
diff --git a/tests/netgroup/test_netgroup_member_case_insensitive.yml b/tests/netgroup/test_netgroup_member_case_insensitive.yml
index 4a1aa9106110410b43b17ebc6a96493e5d42856e..7a0968c07c5b3a55d0f0e37c7d35252e9f0adc9b 100644
--- a/tests/netgroup/test_netgroup_member_case_insensitive.yml
+++ b/tests/netgroup/test_netgroup_member_case_insensitive.yml
@@ -18,7 +18,7 @@
     # SETUP
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Ensure test groups exist.
@@ -92,11 +92,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipaserver_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
-        netgroup: "netgroup{{ item  | lower }}"
+        hostgroup: "hostgroup{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipaserver_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
+        netgroup: "netgroup{{ item | lower }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
@@ -106,11 +106,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipaserver_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
-        netgroup: "netgroup{{ item  | upper }}"
+        hostgroup: "hostgroup{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipaserver_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
+        netgroup: "netgroup{{ item | upper }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
@@ -135,11 +135,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipaserver_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
-        netgroup: "netgroup{{ item  | lower }}"
+        hostgroup: "hostgroup{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipaserver_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
+        netgroup: "netgroup{{ item | lower }}"
         action: member
         state: absent
       loop: "{{ groups_present }}"
@@ -150,11 +150,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipaserver_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
-        netgroup: "netgroup{{ item  | upper }}"
+        hostgroup: "hostgroup{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipaserver_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
+        netgroup: "netgroup{{ item | upper }}"
         action: member
         state: absent
       loop: "{{ groups_present }}"
@@ -165,11 +165,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipaserver_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
-        netgroup: "netgroup{{ item  | upper }}"
+        hostgroup: "hostgroup{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipaserver_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
+        netgroup: "netgroup{{ item | upper }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
@@ -179,11 +179,11 @@
       ipanetgroup:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "hostgroup{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipaserver_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
-        netgroup: "netgroup{{ item  | lower }}"
+        hostgroup: "hostgroup{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipaserver_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
+        netgroup: "netgroup{{ item | lower }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
diff --git a/tests/permission/test_permission.yml b/tests/permission/test_permission.yml
index 99054644abb58c5fb9c827cbcccee89ec99dc5ca..5b27a769fe5c9c53062a6cb050d555615f0ffcdb 100644
--- a/tests/permission/test_permission.yml
+++ b/tests/permission/test_permission.yml
@@ -247,7 +247,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries"
+  - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
     ipapermission:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -259,7 +259,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again
+  - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
     ipapermission:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -271,7 +271,7 @@
     register: result
     failed_when: result.changed or result.failed
 
-  - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries"
+  - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries"
     ipapermission:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
@@ -284,7 +284,7 @@
     register: result
     failed_when: not result.changed or result.failed
 
-  - name: Ensure attributes carlicense and displayname are present in permission "System{{':'}} Update DNS Entries" again
+  - name: Ensure attributes carlicense and displayname are present in permission "System{{ ':' }} Update DNS Entries" again
     ipapermission:
       ipaadmin_password: SomeADMINpassword
       ipaapi_context: "{{ ipa_context | default(omit) }}"
diff --git a/tests/pwpolicy/test_pwpolicy.yml b/tests/pwpolicy/test_pwpolicy.yml
index 9d60a92c17999659a98e0147878e00e19c16d5e3..871406fbeb7a479f3d958a96c4f19da2439eee5f 100644
--- a/tests/pwpolicy/test_pwpolicy.yml
+++ b/tests/pwpolicy/test_pwpolicy.yml
@@ -176,12 +176,10 @@
       minlength: ""
     register: result
     failed_when:
-        result.changed or (
-            result.failed and not (
-                "an internal error has occurred" in result.msg
-                or "int() argument must be" in result.msg
-            )
-        )
+        result.changed or
+        (result.failed and not
+            ("an internal error has occurred" in result.msg or
+             "int() argument must be" in result.msg))
     when: ipa_version is version("4.9", ">=")
 
   - name: Ensure minlength is not cleared due to FreeIPA issue
diff --git a/tests/role/env_facts.yml b/tests/role/env_facts.yml
index ee48608f6e2626b46e22f1b0bd93a2da2d795a58..87c2774366e8fa743ac5ea5609fc49a8c5ac85f8 100644
--- a/tests/role/env_facts.yml
+++ b/tests/role/env_facts.yml
@@ -3,7 +3,7 @@
   block:
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: "'fqdn' in ansible_facts"
   - name: Set Domain to 'ipa.test' if FQDN could not be retrieved.
     ansible.builtin.set_fact:
diff --git a/tests/service/certificate/test_service_certificate.yml b/tests/service/certificate/test_service_certificate.yml
index 2eb207db1d4d6a77c4874afd4ff398f05e228ae6..d5ab12fabaf6ddc5f2a9779f1e45d3e1ffc3c32c 100644
--- a/tests/service/certificate/test_service_certificate.yml
+++ b/tests/service/certificate/test_service_certificate.yml
@@ -17,7 +17,7 @@
 
   - name: Get Domain from server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
     when: ipaserver_domain is not defined
 
   - name: Get IPv4 address prefix from server node
diff --git a/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml b/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
index a999ba9ff90f98871ff5e13cf4eb3683cf5e0175..8df4274a636b2ac8a657f938162bb477c14328ba 100644
--- a/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
+++ b/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
@@ -16,7 +16,7 @@
 
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Get REALM from server name
diff --git a/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml b/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
index 7fa033955d822208a3a06492925ba943274861ef..111608d82366d44401dc751ef58682a3246c98d4 100644
--- a/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
+++ b/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
@@ -16,7 +16,7 @@
 
     - name: Get Domain from server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Get REALM from server name
diff --git a/tests/sudocmdgroup/test_sudocmdgroup.yml b/tests/sudocmdgroup/test_sudocmdgroup.yml
index 39f222f888076f5b05b19537a4c640851773e9fa..ae0441b7a783a494ee4cf0be0dffeb3ad225a65a 100644
--- a/tests/sudocmdgroup/test_sudocmdgroup.yml
+++ b/tests/sudocmdgroup/test_sudocmdgroup.yml
@@ -88,7 +88,7 @@
       KRB5CCNAME="verify_sudocmdgroup" ipa sudocmdgroup-show network --all
       kdestroy -A -q -c verify_sudocmdgroup
     register: result
-    failed_when: result.failed or not("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout)
+    failed_when: result.failed or not ("/usr/sbin/ifconfig" in result.stdout and "/usr/sbin/iwlist" in result.stdout)
 
   - name: Ensure sudocmdgroup, with sudocmds, is absent
     ipasudocmdgroup:
diff --git a/tests/sudorule/test_sudorule_categories.yml b/tests/sudorule/test_sudorule_categories.yml
index 5fdf24d9ef9aad392b652a5a014b8a6e70e8622c..95b94f128253998de64cd2ba7f8d9cf33c51957f 100644
--- a/tests/sudorule/test_sudorule_categories.yml
+++ b/tests/sudorule/test_sudorule_categories.yml
@@ -7,7 +7,7 @@
   tasks:
   - name: Get Domain from the server name
     ansible.builtin.set_fact:
-      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+      ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
 
   - name: Ensure sudorules are absent
     ipasudorule:
diff --git a/tests/sudorule/test_sudorule_member_case_insensitive.yml b/tests/sudorule/test_sudorule_member_case_insensitive.yml
index 582e8204eb5248feb77f94a7ccf1e9a8e1a81b55..cc212406a4fc3fde88c6d6fbec32d0a3b0eaa444 100644
--- a/tests/sudorule/test_sudorule_member_case_insensitive.yml
+++ b/tests/sudorule/test_sudorule_member_case_insensitive.yml
@@ -147,10 +147,10 @@
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
         cmdcategory: all
-        hostgroup: "{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipa_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
+        hostgroup: "{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipa_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
       loop: "{{ groups_present }}"
       register: result
       failed_when: result.failed or result.changed
@@ -160,10 +160,10 @@
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
         cmdcategory: all
-        hostgroup: "{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipa_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
+        hostgroup: "{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipa_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
       loop: "{{ groups_present }}"
       register: result
       failed_when: result.failed or result.changed
@@ -186,10 +186,10 @@
       ipasudorule:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipa_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
+        hostgroup: "{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipa_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
         action: member
         state: absent
       loop: "{{ groups_present }}"
@@ -200,10 +200,10 @@
       ipasudorule:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipa_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
+        hostgroup: "{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipa_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
         action: member
         state: absent
       loop: "{{ groups_present }}"
@@ -214,10 +214,10 @@
       ipasudorule:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "{{ item  | upper }}"
-        host: "{{ item  | upper }}.{{ ipa_domain }}"
-        group: "{{ item  | upper }}"
-        user: "user{{ item  | upper }}"
+        hostgroup: "{{ item | upper }}"
+        host: "{{ item | upper }}.{{ ipa_domain }}"
+        group: "{{ item | upper }}"
+        user: "user{{ item | upper }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
@@ -227,10 +227,10 @@
       ipasudorule:
         ipaadmin_password: SomeADMINpassword
         name: "{{ item }}"
-        hostgroup: "{{ item  | lower }}"
-        host: "{{ item  | lower }}.{{ ipa_domain }}"
-        group: "{{ item  | lower }}"
-        user: "user{{ item  | lower }}"
+        hostgroup: "{{ item | lower }}"
+        host: "{{ item | lower }}.{{ ipa_domain }}"
+        group: "{{ item | lower }}"
+        user: "user{{ item | lower }}"
         action: member
       loop: "{{ groups_present }}"
       register: result
diff --git a/tests/sudorule/test_sudorule_single_hostnames.yml b/tests/sudorule/test_sudorule_single_hostnames.yml
index 0fad2b1ecf0d4d40082293db52667e6c1eb8f555..cc6a781928bfea707463c983781335cc4dbb4b4e 100644
--- a/tests/sudorule/test_sudorule_single_hostnames.yml
+++ b/tests/sudorule/test_sudorule_single_hostnames.yml
@@ -10,7 +10,7 @@
     # setup test environment
     - name: Get Domain from the server name
       ansible.builtin.set_fact:
-        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
+        ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Ensure test sudo rule is absent
diff --git a/tests/trust/test_trust.yml b/tests/trust/test_trust.yml
index 2bf236f1c702d242539bef3af1d0d4744f21a0d3..e0e633860653ba56746578c2888a34334a336fb2 100644
--- a/tests/trust/test_trust.yml
+++ b/tests/trust/test_trust.yml
@@ -48,7 +48,7 @@
       register: result
       failed_when: result.failed or not result.changed
 
-    - name: check if 'ipa-ad-trust' trust exists
+    - name: Check if 'ipa-ad-trust' trust exists
       ansible.builtin.shell: |
         echo 'SomeADMINpassword' | kinit admin
         ipa trust-find
diff --git a/tests/user/test_users_absent.yml b/tests/user/test_users_absent.yml
index 23670510ed8cf35b050df6923cb6b34766b5b924..59a15feaa2b73f6917a6e8779c1193fd0eef5467 100644
--- a/tests/user/test_users_absent.yml
+++ b/tests/user/test_users_absent.yml
@@ -14,7 +14,7 @@
 
   - name: Create dict with user names
     ansible.builtin.set_fact:
-      user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}"
+      user_names: "{{ user_names | default([]) + [{'name': item.name}] }}"
     loop: "{{ users }}"
 
   - name: Users absent len:{{ users | length }}
diff --git a/tests/user/test_users_present_slice.yml b/tests/user/test_users_present_slice.yml
index 904be415ae8c13342a7c0345805807160c0e4900..c3274974d5bd9df84a303169c0d4dc11397ac664 100644
--- a/tests/user/test_users_present_slice.yml
+++ b/tests/user/test_users_present_slice.yml
@@ -19,5 +19,5 @@
   - name: Users present
     ipauser:
       ipaadmin_password: SomeADMINpassword
-      users: "{{ users[item:item+slice_size] }}"
-    loop: "{{ range(0,users | length, slice_size) | list }}"
+      users: "{{ users[item : item + slice_size] }}"
+    loop: "{{ range(0, users | length, slice_size) | list }}"
diff --git a/tests/vault/test_vault_symmetric.yml b/tests/vault/test_vault_symmetric.yml
index 89ee142482f067b9f0ee7023a113926b9e968002..344ea69157f4a97996b81e35d3a93a01045f0426 100644
--- a/tests/vault/test_vault_symmetric.yml
+++ b/tests/vault/test_vault_symmetric.yml
@@ -267,7 +267,7 @@
       salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
       new_password: SomeVAULTpassword
     register: result
-    failed_when: not result.failed and  "Vault `salt` can only change when changing the password." not in result.msg
+    failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
 
   - name: Try to change symmetric vault salt, without providing `new_password`
     ipavault:
@@ -276,7 +276,7 @@
       salt: MTIzNDU2Nzg5MDEyMzQ1Ngo=
       password: SomeVAULTpassword
     register: result
-    failed_when: not result.failed and  "Vault `salt` can only change when changing the password." not in result.msg
+    failed_when: not result.failed and "Vault `salt` can only change when changing the password." not in result.msg
 
   - name: Try to change symmetric vault salt, using wrong password.
     ipavault: