diff --git a/scapy/layers/dhcp6.py b/scapy/layers/dhcp6.py
index 84737991dff..ca24bb17b25 100644
--- a/scapy/layers/dhcp6.py
+++ b/scapy/layers/dhcp6.py
@@ -1875,7 +1875,7 @@ def _include_options(query, answer):
             client_duid = p[DHCP6OptClientId].duid
             resp = IPv6(src=self.src_addr, dst=req_src)
             resp /= UDP(sport=547, dport=546)
-            resp /= DHCP6_Solicit(trid=trid)
+            resp /= DHCP6_Reply(trid=trid)
             resp /= DHCP6OptServerId(duid=self.duid)
             resp /= DHCP6OptClientId(duid=client_duid)
 
diff --git a/test/answering_machines.uts b/test/answering_machines.uts
index f81f4fbbe0d..bee850405cb 100644
--- a/test/answering_machines.uts
+++ b/test/answering_machines.uts
@@ -232,7 +232,7 @@ assert a.is_request(req)
 res = a.make_reply(req)
 assert not a.is_request(res)
 assert res[UDP].dport == 546
-assert res[DHCP6_Solicit]
+assert res[DHCP6_Reply]
 a.print_reply(req, res)
 
 = WiFi_am