diff --git a/src/decode-events.h b/src/decode-events.h
index 232a9c0770..6c7f4df7c4 100644
--- a/src/decode-events.h
+++ b/src/decode-events.h
@@ -366,6 +366,13 @@ static inline int AppLayerDecoderEventsIsEventSet(AppLayerDecoderEvents *devents
     return 0;
 }
 
+#define AppLayerDecoderEventsResetEvents(devents)           \
+    do {                                                    \
+        if ((devents) != NULL) {                            \
+            (devents)->cnt = 0;                             \
+        }                                                   \
+    } while (0)
+
 #define AppLayerDecoderEventsFreeEvents(devents)            \
     do {                                                    \
         if ((devents) != NULL) {                            \
diff --git a/src/detect-dns-query.c b/src/detect-dns-query.c
index 5570239ff1..8f1c6597fe 100644
--- a/src/detect-dns-query.c
+++ b/src/detect-dns-query.c
@@ -1028,16 +1028,12 @@ static int DetectDnsQueryTest07(void) {
         printf("(p3) sig 2 didn't alert, but it should have: ");
         goto end;
     }
-    /* VJ currently we when we reset de_state we reset AMATCH too,
-     * this resets app-layer-event matching as well. However, we
-     * are not clearing/reseting app events, so we match over and
-     * over again */
-#if 0
+    /** \todo should not alert, bug #839
     if (PacketAlertCheck(p3, 3)) {
-        printf("(p3) sig 3 did alerted, but it should not have: ");
+        printf("(p3) sig 3 did alert, but it should not have: ");
         goto end;
     }
-#endif
+    */
     result = 1;
 
 end: