diff --git a/tests/dnsrecord/env_cleanup.yml b/tests/dnsrecord/env_cleanup.yml
index 5b9b7343ff80d9603e91c6c79799054fcb425132..c5890fa0ba33db6a6ed280e366f9bf09c01d8564 100644
--- a/tests/dnsrecord/env_cleanup.yml
+++ b/tests/dnsrecord/env_cleanup.yml
@@ -129,7 +129,7 @@
        - "{{ zone_prefix_reverse_24 }}"
        - "{{ zone_prefix_reverse_16 }}"
        - "{{ zone_prefix_reverse_8 }}"
+       - "{{ zone_ipv6_reverse }}"
+       - "{{ zone_ipv6_reverse_workaround }}"
        - "{{ testzone }}"
-       - ip6.arpa.
-       - d.f.ip6.arpa.
        - "{{ safezone }}"
diff --git a/tests/dnsrecord/env_setup.yml b/tests/dnsrecord/env_setup.yml
index d9a8546b991b99ed51c635e88851558245e64b5a..ebdb7570fd08081b977c8ea1da3fa1fb901e1304 100644
--- a/tests/dnsrecord/env_setup.yml
+++ b/tests/dnsrecord/env_setup.yml
@@ -18,8 +18,9 @@
     - "{{ zone_prefix_reverse_24 }}"
     - "{{ zone_prefix_reverse_16 }}"
     - "{{ zone_prefix_reverse_8 }}"
+    - "{{ zone_ipv6_reverse_workaround }}"
     - "{{ testzone }}"
-    - ip6.arpa.
+    - "{{ zone_ipv6_reverse }}"
 
   - name: Ensure DNSSEC zone '"{{ safezone }}"' is present.
     ipadnszone:
diff --git a/tests/dnsrecord/env_vars.yml b/tests/dnsrecord/env_vars.yml
index bb540a0a9447153f5db7b4fd6126ba19f548f845..d3aef920351e65c948b62c9558bbfa849f0ca9e3 100644
--- a/tests/dnsrecord/env_vars.yml
+++ b/tests/dnsrecord/env_vars.yml
@@ -2,8 +2,11 @@
 # Set common vars and facts for test.
 - name: Set IPv4 address prefix.
   set_fact:
-    ipv4_prefix: '192.168.122'
-    ipv4_reverse_sufix: '122.168.192'
+    ipv4_prefix: "{{ ansible_default_ipv4.address.split('.')[:-1] |
+                     join('.') }}"
+    ipv4_reverse_sufix: "{{ ansible_default_ipv4.address.split('.')[:-1] |
+                            reverse |
+                            join('.') }}"
 
 - name: Set zone prefixes.
   set_fact:
diff --git a/tests/host/test_host_reverse.yml b/tests/host/test_host_reverse.yml
index 883d163576c9126783d3ee79d70a70132ecae539..9a59c489d8582bc1e2286d4b32e20543f6ee4048 100644
--- a/tests/host/test_host_reverse.yml
+++ b/tests/host/test_host_reverse.yml
@@ -25,15 +25,29 @@
     set_fact:
       ipv4_prefix: "{{ ansible_default_ipv4.address.split('.')[:-1] |
                        join('.') }}"
-      reverse_zone: "{{ ansible_default_ipv4.address.split('.')[2::-1] |
-                        join('.') }}"
+
+  - name: Set zone prefixes.
+    set_fact:
+      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"
 
   - name: Set zone for reverse address.
-    command: ipa dnszone-add "{{ item }}" --skip-nameserver-check --skip-overlap-check
+    ipadnszone:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ item }}"
+      skip_nameserver_check: yes
+      skip_overlap_check: yes
     with_items:
-      - "{{ reverse_zone + '.in-addr.arpa.' }}"
-      - 'ip6.arpa.'
-    ignore_errors: yes
+      - "{{ zone_ipv6_reverse }}"
+      - "{{ zone_ipv6_reverse_workaround }}"
+      - "{{ zone_prefix_reverse }}"
+      - "{{ zone_prefix_reverse_8 }}"
+      - "{{ zone_prefix_reverse_16 }}"
+      - "{{ zone_prefix_reverse_24 }}"
 
   - name: Host "{{ host1_fqdn }}" present
     ipahost:
@@ -95,8 +109,15 @@
     register: result
     failed_when: not result.changed
 
-  - name: Set zone for reverse address.
-    command: ipa dnszone-del "{{ item }}"
+  - name: Delete zone for reverse address.
+    ipadnszone:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ item }}"
+      state: absent
     with_items:
-      - "{{ reverse_zone + '.in-addr.arpa.' }}"
-      - 'ip6.arpa.'
+      - "{{ zone_ipv6_reverse }}"
+      - "{{ zone_ipv6_reverse_workaround }}"
+      - "{{ zone_prefix_reverse }}"
+      - "{{ zone_prefix_reverse_8 }}"
+      - "{{ zone_prefix_reverse_16 }}"
+      - "{{ zone_prefix_reverse_24 }}"
diff --git a/tests/service/test_service.yml b/tests/service/test_service.yml
index 6b9f466e2fa2efb7d3409c059e257870df069f09..9b60524721f996a0614566f785f314ca6e879eb3 100644
--- a/tests/service/test_service.yml
+++ b/tests/service/test_service.yml
@@ -51,13 +51,16 @@
       ipaadmin_password: SomeADMINpassword
       hosts:
           - name: "{{ host1_fqdn }}"
+            ip_address: "{{ ipv4_prefix + '.101' }}"
             force: yes
           - name: "{{ host2_fqdn }}"
+            ip_address: "{{ ipv4_prefix + '.102' }}"
             force: yes
           - name: "{{ svc_fqdn }}"
             ip_address: "{{ ipv4_prefix + '.201' }}"
           - name: svc.ihavenodns.info
             force: yes
+      update_dns: yes
 
   - name: Ensure testing user user01 is present.
     ipauser: