diff --git a/tests/dns-tcp-www-google-com/README.md b/tests/dns/dns-tcp-www-google-com/README.md
similarity index 100%
rename from tests/dns-tcp-www-google-com/README.md
rename to tests/dns/dns-tcp-www-google-com/README.md
diff --git a/tests/dns-tcp-www-google-com/suricata.yaml b/tests/dns/dns-tcp-www-google-com/suricata.yaml
similarity index 100%
rename from tests/dns-tcp-www-google-com/suricata.yaml
rename to tests/dns/dns-tcp-www-google-com/suricata.yaml
diff --git a/tests/dns/dns-tcp-www-google-com/test.yaml b/tests/dns/dns-tcp-www-google-com/test.yaml
new file mode 100644
index 000000000..2ad79ccc8
--- /dev/null
+++ b/tests/dns/dns-tcp-www-google-com/test.yaml
@@ -0,0 +1,17 @@
+pcap: ../../dns-tcp-www-google-com-v1/dns.pcap
+
+checks:
+  - filter:
+      count: 1
+      match:
+        src_ip: "10.16.1.11"
+        dest_ip: "8.8.4.4"
+        event_type: dns
+        dns.type: request
+  - filter:
+      count: 1
+      match:
+        src_ip: "10.16.1.11"
+        dest_ip: "8.8.4.4"
+        event_type: dns
+        dns.type: response
diff --git a/tests/dns/v2/dns-tcp-www-google-com/README.md b/tests/dns/v2/dns-tcp-www-google-com/README.md
new file mode 100644
index 000000000..d1db12dc6
--- /dev/null
+++ b/tests/dns/v2/dns-tcp-www-google-com/README.md
@@ -0,0 +1,2 @@
+A basic TCP DNS test that sends one request with a response that
+contains multiple answers.
diff --git a/tests/dns/v2/dns-tcp-www-google-com/suricata.yaml b/tests/dns/v2/dns-tcp-www-google-com/suricata.yaml
new file mode 100644
index 000000000..bb1377759
--- /dev/null
+++ b/tests/dns/v2/dns-tcp-www-google-com/suricata.yaml
@@ -0,0 +1,13 @@
+%YAML 1.1
+---
+
+# Remove stats logging.
+stats:
+  enabled: no
+
+outputs:
+  - eve-log:
+      enabled: yes
+      types:
+        - dns:
+            version: 2
diff --git a/tests/dns-tcp-www-google-com/test.yaml b/tests/dns/v2/dns-tcp-www-google-com/test.yaml
similarity index 77%
rename from tests/dns-tcp-www-google-com/test.yaml
rename to tests/dns/v2/dns-tcp-www-google-com/test.yaml
index 9dbe5d5bd..b9331008e 100644
--- a/tests/dns-tcp-www-google-com/test.yaml
+++ b/tests/dns/v2/dns-tcp-www-google-com/test.yaml
@@ -1,8 +1,4 @@
-pcap: ../dns-tcp-www-google-com-v1/dns.pcap
-
-requires:
-  features:
-    - HAVE_LIBJANSSON
+pcap: ../../../dns-tcp-www-google-com-v1/dns.pcap
 
 checks:
   - filter: