diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py
index 7108839c09d0bea030a4809db078b259982783fe..9b22f5bf69f0423df9084bc069c41d4bbf47f73d 100644
--- a/plugins/modules/ipahost.py
+++ b/plugins/modules/ipahost.py
@@ -1197,13 +1197,14 @@ def main():
                     host_name = name[:name.find(".")]
 
                     _args = {"idnsname": host_name}
-                    if reverse is not None:
-                        _args["a_extra_create_reverse"] = reverse
-                        _args["aaaa_extra_create_reverse"] = reverse
                     if len(dnsrecord_a_add) > 0:
                         _args["arecord"] = dnsrecord_a_add
+                        if reverse is not None:
+                            _args["a_extra_create_reverse"] = reverse
                     if len(dnsrecord_aaaa_add) > 0:
                         _args["aaaarecord"] = dnsrecord_aaaa_add
+                        if reverse is not None:
+                            _args["aaaa_extra_create_reverse"] = reverse
 
                     commands.append([domain_name,
                                      "dnsrecord_add", _args])
diff --git a/tests/host/test_host_reverse.yml b/tests/host/test_host_reverse.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9031b70b33aadfd63d130fcea21f2a669d040b01
--- /dev/null
+++ b/tests/host/test_host_reverse.yml
@@ -0,0 +1,103 @@
+---
+- name: Test host
+  hosts: ipaserver
+  become: true
+  gather_facts: true
+
+  tasks:
+  - name: Get Domain from server name
+    set_fact:
+      ipaserver_domain: "{{ groups.ipaserver[0].split('.')[1:] | join ('.') }}"
+    when: ipaserver_domain is not defined
+
+  - name: Set host1_fqdn
+    set_fact:
+      host1_fqdn: "{{ 'host1.' + ipaserver_domain }}"
+
+  - name: Host absent
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name:
+      - "{{ host1_fqdn }}"
+      update_dns: yes
+      state: absent
+
+  - name: Get IPv4 address prefix from server node
+    set_fact:
+      ipv4_prefix: "{{ ansible_default_ipv4.address.split('.')[:-1] |
+                       join('.') }}"
+      reverse_zone: "{{ ansible_default_ipv4.address.split('.')[2::-1] |
+                        join('.') }}"
+
+  - name: Set zone for reverse address.
+    command: ipa dnszone-add "{{ item }}" --skip-nameserver-check --skip-overlap-check
+    with_items:
+      - "{{ reverse_zone + '.in-addr.arpa.' }}"
+      - 'ip6.arpa.'
+    ignore_errors: yes
+
+  - name: Host "{{ host1_fqdn }}" present
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ host1_fqdn }}"
+      ip_address: "{{ ipv4_prefix + '.201' }}"
+      update_dns: yes
+      reverse: yes
+    register: result
+    failed_when: not result.changed
+
+  - name: Host "{{ host1_fqdn }}" present, again.
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ host1_fqdn }}"
+      ip_address: "{{ ipv4_prefix + '.201' }}"
+      update_dns: yes
+      reverse: yes
+    register: result
+    failed_when: result.changed
+
+  - name: Hosts host1 absent
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name:
+      - "{{ host1_fqdn }}"
+      update_dns: yes
+      state: absent
+    register: result
+    failed_when: not result.changed
+
+  - name: Host "{{ host1_fqdn }}" present with IPv6
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ host1_fqdn }}"
+      ip_address: "fd00::0001"
+      update_dns: yes
+      reverse: yes
+    register: result
+    failed_when: not result.changed
+
+  - name: Host "{{ host1_fqdn }}" present with IPv6, again.
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name: "{{ host1_fqdn }}"
+      ip_address: "fd00::0001"
+      update_dns: yes
+      reverse: yes
+    register: result
+    failed_when: result.changed
+
+  - name: Hosts host1 absent
+    ipahost:
+      ipaadmin_password: SomeADMINpassword
+      name:
+      - "{{ host1_fqdn }}"
+      update_dns: yes
+      state: absent
+    register: result
+    failed_when: not result.changed
+
+  - name: Set zone for reverse address.
+    command: ipa dnszone-del "{{ item }}"
+    with_items:
+      - "{{ reverse_zone + '.in-addr.arpa.' }}"
+      - 'ip6.arpa.'