diff --git a/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerIcmp.cs b/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerIcmp.cs
index 7c0bd12a..1a1ab310 100644
--- a/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerIcmp.cs
+++ b/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerIcmp.cs
@@ -61,9 +61,7 @@ protected override bool CompareField(XElement field, Datagram datagram)
                             }
                             else
                             {
-                                // TODO: Remove this condition when https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10991 and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10992 are fixed.
-                                if (!(icmpIpV4PayloadDatagram is IcmpParameterProblemDatagram || icmpIpV4PayloadDatagram is IcmpRedirectDatagram))
-                                    field.AssertDataField(icmpIpV4PayloadDatagram.IpV4.Payload);
+                                field.AssertDataField(icmpIpV4PayloadDatagram.IpV4.Payload);
                             }
                         }
                     }
diff --git a/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerTcp.cs b/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerTcp.cs
index 00697329..38d979b5 100644
--- a/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerTcp.cs
+++ b/PcapDotNet/src/PcapDotNet.Core.Test/WiresharkDatagramComparerTcp.cs
@@ -268,6 +268,7 @@ private static void CompareTcpOptions(XElement element, TcpOptions options)
                         field.Show().StartsWith("Unknown (0x0a) ") || // Unknown in Wireshark but known (and invalid) in Pcap.Net.
                         field.Show().StartsWith("Unknown (0x19) ") || // Unknown in Wireshark but known (and invalid) in Pcap.Net.
                         field.Show().StartsWith("Unknown (0x2d) ") || // Unknown in Wireshark and unknown and invalid in Pcap.Net.
+                        field.Show().StartsWith("Unknown (0x84) ") || // Unknown in Wireshark and unknown and invalid in Pcap.Net.
                         field.Show().StartsWith("Unknown (0xa9) ") || // Unknown in Wireshark and unknown and invalid in Pcap.Net.
                         field.Show().StartsWith("Echo reply (with option length = ") ||
                         field.Show().Contains("bytes says option goes past end of options") ||