diff --git a/tests/dns-udp-double-request-response/README.txt b/tests/dns/dns-udp-double-request-response/README.txt
similarity index 100%
rename from tests/dns-udp-double-request-response/README.txt
rename to tests/dns/dns-udp-double-request-response/README.txt
diff --git a/tests/dns-udp-double-request-response/suricata.yaml b/tests/dns/dns-udp-double-request-response/suricata.yaml
similarity index 100%
rename from tests/dns-udp-double-request-response/suricata.yaml
rename to tests/dns/dns-udp-double-request-response/suricata.yaml
diff --git a/tests/dns/dns-udp-double-request-response/test.yaml b/tests/dns/dns-udp-double-request-response/test.yaml
new file mode 100644
index 000000000..639a6364f
--- /dev/null
+++ b/tests/dns/dns-udp-double-request-response/test.yaml
@@ -0,0 +1,16 @@
+pcap: ../../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
+
+requires:
+  min-version: 8
+
+checks:
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.type: request
+  - filter:
+      count: 2
+      match:
+        event_type: dns
+        dns.type: response
diff --git a/tests/dns/v2/dns-udp-double-request-response/README.txt b/tests/dns/v2/dns-udp-double-request-response/README.txt
new file mode 100644
index 000000000..d0a46a673
--- /dev/null
+++ b/tests/dns/v2/dns-udp-double-request-response/README.txt
@@ -0,0 +1,8 @@
+Test 2 UDP DNS requests followed back to back with no response, then
+the 2 responses being received.
+
+Prior to Suricata 3.2 the first request would be marked as having a
+reply lost when the second request was seen.
+
+Related issue:
+https://redmine.openinfosecfoundation.org/issues/1923
diff --git a/tests/dns/v2/dns-udp-double-request-response/suricata.yaml b/tests/dns/v2/dns-udp-double-request-response/suricata.yaml
new file mode 100644
index 000000000..4db348acd
--- /dev/null
+++ b/tests/dns/v2/dns-udp-double-request-response/suricata.yaml
@@ -0,0 +1,10 @@
+%YAML 1.1
+---
+
+outputs:
+  - eve-log:
+      enabled: yes
+      filename: eve.json
+      types:
+        - dns:
+            version: 2
diff --git a/tests/dns-udp-double-request-response/test.yaml b/tests/dns/v2/dns-udp-double-request-response/test.yaml
similarity index 59%
rename from tests/dns-udp-double-request-response/test.yaml
rename to tests/dns/v2/dns-udp-double-request-response/test.yaml
index 5df0f6337..25311ee3b 100644
--- a/tests/dns-udp-double-request-response/test.yaml
+++ b/tests/dns/v2/dns-udp-double-request-response/test.yaml
@@ -1,8 +1,4 @@
-pcap: ../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
-
-requires:
-  features:
-    - HAVE_LIBJANSSON
+pcap: ../../../dns-udp-double-request-response-v1/dns-udp-double-request-response.pcap
 
 checks:
   - filter: