diff --git a/ChangeLog b/ChangeLog
index 7f9f8eb1..159b00ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 * 2017-12-??: Version 1.3.0
+  * Skip unit tests that fail with dnsmasq when the SKIP_DNSMASQ_ISSUE
+    variable is set.  Thanks Konomi Kitten
   * Specify default available cipher suites for authenticated TLS
     upstreams with getdns_context_set_tls_ciphers_list()
     An upstream specific available cipher suite may also be given
diff --git a/src/test/check_getdns_context_set_dns_transport.h b/src/test/check_getdns_context_set_dns_transport.h
index f76ee74b..15322296 100644
--- a/src/test/check_getdns_context_set_dns_transport.h
+++ b/src/test/check_getdns_context_set_dns_transport.h
@@ -187,8 +187,9 @@
        ASSERT_RC(type, GETDNS_RESOLUTION_STUB, "Query did not use stub mode");
        ASSERT_RC(getdns_dict_get_int(response, "/replies_tree/0/header/tc", &tc),
          GETDNS_RETURN_GOOD, "Failed to extract \"tc\"");
-       ASSERT_RC(tc, 1, "Packet not trucated as expected");
-
+       if (!getenv("SKIP_DNSMASQ_ISSUE")) {
+         ASSERT_RC(tc, 1, "Packet not truncated as expected");
+       }
        /* Re-do over TCP */
        ASSERT_RC(getdns_context_set_dns_transport(context, GETDNS_TRANSPORT_TCP_ONLY),
          GETDNS_RETURN_GOOD, "Return code from getdns_context_set_dns_transport()");