diff --git a/test/200_dns_test.sh b/test/200_dns_test.sh
index f4d8c998..78a845a5 100755
--- a/test/200_dns_test.sh
+++ b/test/200_dns_test.sh
@@ -15,6 +15,4 @@ start_container_with_dns $HOST1 $C1/24 --name=c1
 
 assert_dns_record $HOST1 c1 $NAME $C2
 
-assert_raises "exec_on $HOST1 c1 dig MX $NAME | grep -q 'status: NXDOMAIN'"
-
 end_suite
diff --git a/test/250_dns_negative_test.sh b/test/250_dns_negative_test.sh
index f89b6698..749a8bf0 100755
--- a/test/250_dns_negative_test.sh
+++ b/test/250_dns_negative_test.sh
@@ -6,7 +6,11 @@ start_suite "Negative DNS queries"
 
 weave_on $HOST1 launch
 start_container_with_dns $HOST1 --name c1
-assert_raises "exec_on $HOST1 c1 dig A foo.weave.local | grep 'status: NXDOMAIN'"
-assert_raises "exec_on $HOST1 c1 dig A foo.invalid | grep 'status: NXDOMAIN'"
+
+# unknown name, invalid domain, and unsupported query types should all
+# trigger NXDOMAIN
+assert_raises "exec_on $HOST1 c1 dig A foo.weave.local | grep -q 'status: NXDOMAIN'"
+assert_raises "exec_on $HOST1 c1 dig A foo.invalid     | grep -q 'status: NXDOMAIN'"
+assert_raises "exec_on $HOST1 c1 dig MX $NAME          | grep -q 'status: NXDOMAIN'"
 
 end_suite