diff --git a/lib/hierarchy.js b/lib/hierarchy.js
index 702e5b5bb..a597fc770 100644
--- a/lib/hierarchy.js
+++ b/lib/hierarchy.js
@@ -1,5 +1,6 @@
 'use strict';
 
+var _ = require('lodash');
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
 /**
@@ -119,16 +120,24 @@ module.exports = function (comments) {
           comment.members[scope] = node.members[scope];
         }
 
+        var events = comment.members.events || [];
+        var groups = [];
+
         if (comment.members.instance.length) {
-          comment.members.events = comment.members.instance.filter(function (member) {
-            return member.kind === 'event';
-          });
+          groups = _.groupBy(comment.members.instance, isEvent);
 
-          comment.members.instance = comment.members.instance.filter(function (member) {
-            return member.kind !== 'event';
-          });
+          events = events.concat(groups[true] || []);
+          comment.members.instance = groups[false] || [];
+        }
+
+        if (comment.members.static.length) {
+          groups = _.groupBy(comment.members.static, isEvent);
+
+          events = events.concat(groups[true] || []);
+          comment.members.static = groups[false] || [];
         }
 
+        comment.members.events = events;
 
         comment.path = path.map(pick).concat(pick(comment));
 
@@ -168,3 +177,12 @@ module.exports = function (comments) {
 
   return toComments(root.members.static);
 };
+
+/**
+ * Check if a given member object is of kind `event`.
+ * @param {Object} member - The member to check.
+ * @returns {boolean} `true` if it is of kind `event`, otherwise false.
+ */
+function isEvent(member) {
+  return member.kind === 'event';
+}
diff --git a/test/fixture/_external-deps-included.json b/test/fixture/_external-deps-included.json
index 779e67335..15b2c155d 100644
--- a/test/fixture/_external-deps-included.json
+++ b/test/fixture/_external-deps-included.json
@@ -114,7 +114,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -275,7 +276,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -436,7 +438,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/_multi-file-input.json b/test/fixture/_multi-file-input.json
index 854a11638..dd227b807 100644
--- a/test/fixture/_multi-file-input.json
+++ b/test/fixture/_multi-file-input.json
@@ -232,7 +232,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -393,7 +394,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/boolean-literal-type.output.json b/test/fixture/boolean-literal-type.output.json
index 2ea4eb916..51d31929a 100644
--- a/test/fixture/boolean-literal-type.output.json
+++ b/test/fixture/boolean-literal-type.output.json
@@ -66,7 +66,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/class.output.json b/test/fixture/class.output.json
index c539e4535..49b3b81e0 100644
--- a/test/fixture/class.output.json
+++ b/test/fixture/class.output.json
@@ -385,7 +385,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -551,7 +552,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/document-exported-export-default-object.output.json b/test/fixture/document-exported-export-default-object.output.json
index c85665602..03b839755 100644
--- a/test/fixture/document-exported-export-default-object.output.json
+++ b/test/fixture/document-exported-export-default-object.output.json
@@ -28,7 +28,8 @@
     "name": "document-exported-export-default-object.input",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -66,7 +67,8 @@
     "name": "x",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/document-exported-export-default-value.output.json b/test/fixture/document-exported-export-default-value.output.json
index e15877f5d..baa003f74 100644
--- a/test/fixture/document-exported-export-default-value.output.json
+++ b/test/fixture/document-exported-export-default-value.output.json
@@ -28,7 +28,8 @@
     "name": "document-exported-export-default-value.input",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/document-exported.output.json b/test/fixture/document-exported.output.json
index b886f3cbc..29d6660e1 100644
--- a/test/fixture/document-exported.output.json
+++ b/test/fixture/document-exported.output.json
@@ -61,7 +61,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -125,7 +126,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -197,7 +199,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -244,7 +247,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -298,7 +302,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -347,7 +352,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -394,7 +400,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -448,7 +455,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -508,7 +516,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -547,7 +556,8 @@
     "name": "y2Default",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -655,7 +665,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -726,7 +737,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -771,7 +783,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -785,7 +798,8 @@
           ],
           "namespace": "object.func"
         }
-      ]
+      ],
+      "events": []
     },
     "path": [
       {
@@ -824,7 +838,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -864,7 +879,8 @@
     "kind": "member",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -911,7 +927,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -951,7 +968,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -991,7 +1009,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1035,7 +1054,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1079,7 +1099,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1123,7 +1144,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1174,7 +1196,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1213,7 +1236,8 @@
     "name": "o1",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1252,7 +1276,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1354,7 +1379,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1393,7 +1419,8 @@
     "name": "o2",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1432,7 +1459,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/es6-class.output.json b/test/fixture/es6-class.output.json
index acdacf6b3..20a562615 100644
--- a/test/fixture/es6-class.output.json
+++ b/test/fixture/es6-class.output.json
@@ -86,7 +86,8 @@
     "kind": "class",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -281,7 +282,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -388,7 +390,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/es6-default2.output.json b/test/fixture/es6-default2.output.json
index 17bb6cac3..43a0cc58f 100644
--- a/test/fixture/es6-default2.output.json
+++ b/test/fixture/es6-default2.output.json
@@ -43,7 +43,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/es6-import.output.json b/test/fixture/es6-import.output.json
index 8388f25d0..4c3b25624 100644
--- a/test/fixture/es6-import.output.json
+++ b/test/fixture/es6-import.output.json
@@ -157,7 +157,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -247,7 +248,8 @@
     "name": "es6-ext",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -407,7 +409,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/es6.output.json b/test/fixture/es6.output.json
index 4e899117d..62862566d 100644
--- a/test/fixture/es6.output.json
+++ b/test/fixture/es6.output.json
@@ -115,7 +115,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -244,7 +245,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -500,7 +502,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -674,7 +677,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -772,7 +776,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -874,7 +879,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -1064,7 +1070,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -1164,7 +1171,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -1341,7 +1349,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1590,7 +1599,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1691,7 +1701,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1796,7 +1807,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1887,7 +1899,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2048,7 +2061,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2146,7 +2160,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2244,7 +2259,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2342,7 +2358,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2432,7 +2449,8 @@
     "name": "execute",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2601,7 +2619,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/event.output.json b/test/fixture/event.output.json
index 934cbf267..ae349584c 100644
--- a/test/fixture/event.output.json
+++ b/test/fixture/event.output.json
@@ -237,7 +237,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/example-caption.output.json b/test/fixture/example-caption.output.json
index 1a9091b06..7fb36daf6 100644
--- a/test/fixture/example-caption.output.json
+++ b/test/fixture/example-caption.output.json
@@ -213,7 +213,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/external.output.json b/test/fixture/external.output.json
index 929a6a4c4..c8e02a0b7 100644
--- a/test/fixture/external.output.json
+++ b/test/fixture/external.output.json
@@ -114,7 +114,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/factory.output.json b/test/fixture/factory.output.json
index 4b9d07561..7e7078904 100644
--- a/test/fixture/factory.output.json
+++ b/test/fixture/factory.output.json
@@ -150,7 +150,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -205,7 +206,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -317,7 +319,8 @@
     "scope": "static",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/html/nested.config-output.html b/test/fixture/html/nested.config-output.html
index 4250860a2..626338271 100644
--- a/test/fixture/html/nested.config-output.html
+++ b/test/fixture/html/nested.config-output.html
@@ -76,12 +76,6 @@ <h3 class='mb0 no-anchor'></h3>
                         .MAGIC_NUMBER
                       </a></li>
                     
-                      <li><a
-                        href='#Klass.event:event'
-                        class='regular pre-open'>
-                        .event
-                      </a></li>
-                    
                     </ul>
                   
                   
@@ -103,6 +97,17 @@ <h3 class='mb0 no-anchor'></h3>
                     </ul>
                   
                   
+                    <ul class='list-reset py1-ul pl1'>
+                      <li class='h5'>Events</li>
+                      
+                        <li><a
+                          href='#Klass.event:event'
+                          class='regular pre-open'>
+                          ⓔ event
+                        </a></li>
+                      
+                    </ul>
+                  
                 </div>
                 
                 </li>
@@ -628,51 +633,6 @@ <h3 class='fl m0' id='klass'>
   
 
   
-
-  
-
-  
-</section>
-
-      </div>
-    </div>
-  
-    <div class='border-bottom' id='Klass.event:event'>
-      <div class="clearfix small pointer toggle-sibling">
-        <div class="py1 contain">
-            <a class='icon pin-right py1 dark-link caret-right'>▸</a>
-            <span class='code strong strong truncate'>event</span>
-        </div>
-      </div>
-      <div class="clearfix display-none toggle-target">
-        <section class='p2 mb2 clearfix bg-white minishadow'>
-
-  
-
-  <p>Klass event</p>
-
-
-  <div class='pre p1 fill-light mt0'>event</div>
-  
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
 
   
 
@@ -849,6 +809,57 @@ <h3 class='fl m0' id='klass'>
   
 
   
+    <div class='py1 quiet mt1 prose-big'>Events</div>
+    <div class="clearfix">
+  
+    <div class='border-bottom' id='Klass.event:event'>
+      <div class="clearfix small pointer toggle-sibling">
+        <div class="py1 contain">
+            <a class='icon pin-right py1 dark-link caret-right'>▸</a>
+            <span class='code strong strong truncate'>event</span>
+        </div>
+      </div>
+      <div class="clearfix display-none toggle-target">
+        <section class='p2 mb2 clearfix bg-white minishadow'>
+
+  
+
+  <p>Klass event</p>
+
+
+  <div class='pre p1 fill-light mt0'>event</div>
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+</section>
+
+      </div>
+    </div>
+  
+</div>
+
+  
 </section>
 
           
diff --git a/test/fixture/html/nested.output.files b/test/fixture/html/nested.output.files
index c032a4005..4b61d7833 100644
--- a/test/fixture/html/nested.output.files
+++ b/test/fixture/html/nested.output.files
@@ -66,12 +66,6 @@
                         .MAGIC_NUMBER
                       </a></li>
                     
-                      <li><a
-                        href='#Klass.event:event'
-                        class='regular pre-open'>
-                        .event
-                      </a></li>
-                    
                     </ul>
                   
                   
@@ -93,6 +87,17 @@
                     </ul>
                   
                   
+                    <ul class='list-reset py1-ul pl1'>
+                      <li class='h5'>Events</li>
+                      
+                        <li><a
+                          href='#Klass.event:event'
+                          class='regular pre-open'>
+                          ⓔ event
+                        </a></li>
+                      
+                    </ul>
+                  
                 </div>
                 
                 </li>
@@ -590,51 +595,6 @@ k.isArrayOfBuffers();</pre>
   
 
   
-
-  
-
-  
-</section>
-
-      </div>
-    </div>
-  
-    <div class='border-bottom' id='Klass.event:event'>
-      <div class="clearfix small pointer toggle-sibling">
-        <div class="py1 contain">
-            <a class='icon pin-right py1 dark-link caret-right'>▸</a>
-            <span class='code strong strong truncate'>event</span>
-        </div>
-      </div>
-      <div class="clearfix display-none toggle-target">
-        <section class='p2 mb2 clearfix bg-white minishadow'>
-
-  
-
-  <p>Klass event</p>
-
-
-  <div class='pre p1 fill-light mt0'>event</div>
-  
-  
-
-  
-  
-  
-  
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
 
   
 
@@ -811,6 +771,57 @@ k.isArrayOfBuffers();</pre>
   
 
   
+    <div class='py1 quiet mt1 prose-big'>Events</div>
+    <div class="clearfix">
+  
+    <div class='border-bottom' id='Klass.event:event'>
+      <div class="clearfix small pointer toggle-sibling">
+        <div class="py1 contain">
+            <a class='icon pin-right py1 dark-link caret-right'>▸</a>
+            <span class='code strong strong truncate'>event</span>
+        </div>
+      </div>
+      <div class="clearfix display-none toggle-target">
+        <section class='p2 mb2 clearfix bg-white minishadow'>
+
+  
+
+  <p>Klass event</p>
+
+
+  <div class='pre p1 fill-light mt0'>event</div>
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+</section>
+
+      </div>
+    </div>
+  
+</div>
+
+  
 </section>
 
           
diff --git a/test/fixture/infer-params.output.json b/test/fixture/infer-params.output.json
index 1e241cdc1..c17a42800 100644
--- a/test/fixture/infer-params.output.json
+++ b/test/fixture/infer-params.output.json
@@ -87,6 +87,7 @@
     "name": "addThem",
     "kind": "function",
     "members": {
+      "events": [],
       "instance": [],
       "static": []
     },
@@ -162,6 +163,7 @@
     "name": "fishesAndFoxes",
     "kind": "function",
     "members": {
+      "events": [],
       "instance": [],
       "static": []
     },
@@ -255,6 +257,7 @@
           "memberof": "Foo",
           "scope": "instance",
           "members": {
+            "events": [],
             "instance": [],
             "static": []
           },
@@ -331,6 +334,7 @@
     "name": "withDefault",
     "kind": "function",
     "members": {
+      "events": [],
       "instance": [],
       "static": []
     },
@@ -338,4 +342,4 @@
       "withDefault"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/test/fixture/infer-private.output.json b/test/fixture/infer-private.output.json
index 1b7a0a27b..c22c340dd 100644
--- a/test/fixture/infer-private.output.json
+++ b/test/fixture/infer-private.output.json
@@ -163,7 +163,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/inheritance.output.json b/test/fixture/inheritance.output.json
index e39a63b91..16a278e3a 100644
--- a/test/fixture/inheritance.output.json
+++ b/test/fixture/inheritance.output.json
@@ -86,7 +86,8 @@
     "kind": "class",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -147,7 +148,8 @@
     "scope": "static",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/inline-link.output.json b/test/fixture/inline-link.output.json
index 4e5b54dce..d1c001841 100644
--- a/test/fixture/inline-link.output.json
+++ b/test/fixture/inline-link.output.json
@@ -222,7 +222,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -634,7 +635,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/internal.output.json b/test/fixture/internal.output.json
index 929a6a4c4..c8e02a0b7 100644
--- a/test/fixture/internal.output.json
+++ b/test/fixture/internal.output.json
@@ -114,7 +114,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/literal_types.output.json b/test/fixture/literal_types.output.json
index 2aa36d096..9de1c7f47 100644
--- a/test/fixture/literal_types.output.json
+++ b/test/fixture/literal_types.output.json
@@ -100,7 +100,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -176,7 +177,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/memberedclass.output.json b/test/fixture/memberedclass.output.json
index 2a10d55f5..2bb2a5abe 100644
--- a/test/fixture/memberedclass.output.json
+++ b/test/fixture/memberedclass.output.json
@@ -324,7 +324,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -492,7 +493,8 @@
           "scope": "static",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/merge-infered-type.output.json b/test/fixture/merge-infered-type.output.json
index 74112ac39..41dd91050 100644
--- a/test/fixture/merge-infered-type.output.json
+++ b/test/fixture/merge-infered-type.output.json
@@ -250,7 +250,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/multisignature.output.json b/test/fixture/multisignature.output.json
index 677c1b968..e5f568279 100644
--- a/test/fixture/multisignature.output.json
+++ b/test/fixture/multisignature.output.json
@@ -157,7 +157,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -388,7 +389,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/nearby_params.output.json b/test/fixture/nearby_params.output.json
index ccb5eb9f6..47597bfc9 100644
--- a/test/fixture/nearby_params.output.json
+++ b/test/fixture/nearby_params.output.json
@@ -502,7 +502,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/nest_params.output.json b/test/fixture/nest_params.output.json
index 0fd39a47e..5d02dca64 100644
--- a/test/fixture/nest_params.output.json
+++ b/test/fixture/nest_params.output.json
@@ -340,7 +340,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -797,7 +798,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/newline-in-description.output.json b/test/fixture/newline-in-description.output.json
index 72872085c..ecdde1cca 100644
--- a/test/fixture/newline-in-description.output.json
+++ b/test/fixture/newline-in-description.output.json
@@ -161,7 +161,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {}
diff --git a/test/fixture/no-name.output.json b/test/fixture/no-name.output.json
index 88452f663..4a816852c 100644
--- a/test/fixture/no-name.output.json
+++ b/test/fixture/no-name.output.json
@@ -103,7 +103,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {}
diff --git a/test/fixture/optional-record-field-type.output.json b/test/fixture/optional-record-field-type.output.json
index 7f75271c2..44f07d020 100644
--- a/test/fixture/optional-record-field-type.output.json
+++ b/test/fixture/optional-record-field-type.output.json
@@ -76,7 +76,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/params.output.json b/test/fixture/params.output.json
index 8bf7d42f1..5b286ea03 100644
--- a/test/fixture/params.output.json
+++ b/test/fixture/params.output.json
@@ -188,7 +188,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -367,7 +368,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -483,7 +485,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -730,7 +733,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -1197,7 +1201,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1733,7 +1738,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1974,7 +1980,8 @@
     "kind": "constant",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -2135,7 +2142,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/polyglot/blend.json b/test/fixture/polyglot/blend.json
index 7f65cbb51..2e25729bf 100644
--- a/test/fixture/polyglot/blend.json
+++ b/test/fixture/polyglot/blend.json
@@ -175,7 +175,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/react-jsx.output.json b/test/fixture/react-jsx.output.json
index 5a830b1a5..14a9f2f9e 100644
--- a/test/fixture/react-jsx.output.json
+++ b/test/fixture/react-jsx.output.json
@@ -80,7 +80,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/simple-hashbang.output.json b/test/fixture/simple-hashbang.output.json
index 59c584956..a0d7f0904 100644
--- a/test/fixture/simple-hashbang.output.json
+++ b/test/fixture/simple-hashbang.output.json
@@ -150,7 +150,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/simple-two.output.json b/test/fixture/simple-two.output.json
index abf774182..3f98a4adb 100644
--- a/test/fixture/simple-two.output.json
+++ b/test/fixture/simple-two.output.json
@@ -232,7 +232,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/simple.output.github.json b/test/fixture/simple.output.github.json
index 20b5cc7d9..9afbbc824 100644
--- a/test/fixture/simple.output.github.json
+++ b/test/fixture/simple.output.github.json
@@ -152,7 +152,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/simple.output.json b/test/fixture/simple.output.json
index ee6fd4cc9..0867306b0 100644
--- a/test/fixture/simple.output.json
+++ b/test/fixture/simple.output.json
@@ -150,7 +150,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sort-order-alpha.output.json b/test/fixture/sort-order-alpha.output.json
index 9d9257b5c..028a006f2 100644
--- a/test/fixture/sort-order-alpha.output.json
+++ b/test/fixture/sort-order-alpha.output.json
@@ -29,7 +29,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -69,7 +70,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -141,7 +143,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -188,7 +191,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -235,7 +239,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -282,7 +287,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -371,7 +377,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -418,7 +425,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -465,7 +473,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -512,7 +521,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/sorting/output.json b/test/fixture/sorting/output.json
index 8e44ee26b..253946fe2 100644
--- a/test/fixture/sorting/output.json
+++ b/test/fixture/sorting/output.json
@@ -80,7 +80,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -171,7 +172,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -262,7 +264,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/string-literal-key.output.json b/test/fixture/string-literal-key.output.json
index 6396ac2c9..7852b17b9 100644
--- a/test/fixture/string-literal-key.output.json
+++ b/test/fixture/string-literal-key.output.json
@@ -37,7 +37,8 @@
     "kind": "constant",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -127,7 +128,8 @@
     "name": "foo",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/alias.output.json b/test/fixture/sync/alias.output.json
index 51d67f58e..1087e5b3f 100644
--- a/test/fixture/sync/alias.output.json
+++ b/test/fixture/sync/alias.output.json
@@ -111,7 +111,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/empty-example.output.json b/test/fixture/sync/empty-example.output.json
index a6dc7618a..787b35174 100644
--- a/test/fixture/sync/empty-example.output.json
+++ b/test/fixture/sync/empty-example.output.json
@@ -91,7 +91,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/flow-types.output.json b/test/fixture/sync/flow-types.output.json
index 6dbe4b0bf..837ccd756 100644
--- a/test/fixture/sync/flow-types.output.json
+++ b/test/fixture/sync/flow-types.output.json
@@ -156,7 +156,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -480,7 +481,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -635,7 +637,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -739,7 +742,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -834,7 +838,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -965,7 +970,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1070,7 +1076,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1181,7 +1188,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1296,7 +1304,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -1413,7 +1422,8 @@
     },
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/lots-of-options.output.json b/test/fixture/sync/lots-of-options.output.json
index e140f0dca..96d3f4a99 100644
--- a/test/fixture/sync/lots-of-options.output.json
+++ b/test/fixture/sync/lots-of-options.output.json
@@ -1279,7 +1279,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/meta.output.json b/test/fixture/sync/meta.output.json
index 4cc0998e2..cdd66e0fc 100644
--- a/test/fixture/sync/meta.output.json
+++ b/test/fixture/sync/meta.output.json
@@ -169,7 +169,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/multiexample.output.json b/test/fixture/sync/multiexample.output.json
index 48fd4a2a7..f9ee47492 100644
--- a/test/fixture/sync/multiexample.output.json
+++ b/test/fixture/sync/multiexample.output.json
@@ -334,7 +334,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/rename.output.json b/test/fixture/sync/rename.output.json
index 79811ad3c..102ddfa12 100644
--- a/test/fixture/sync/rename.output.json
+++ b/test/fixture/sync/rename.output.json
@@ -86,7 +86,8 @@
     "name": "cheese",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/throws.output.json b/test/fixture/sync/throws.output.json
index 307fcb29b..a3657f0d1 100644
--- a/test/fixture/sync/throws.output.json
+++ b/test/fixture/sync/throws.output.json
@@ -301,7 +301,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/trailing-only.output.json b/test/fixture/sync/trailing-only.output.json
index eaebb188b..cb71c4fea 100644
--- a/test/fixture/sync/trailing-only.output.json
+++ b/test/fixture/sync/trailing-only.output.json
@@ -152,7 +152,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {}
diff --git a/test/fixture/sync/trailing.output.json b/test/fixture/sync/trailing.output.json
index c2bd778d3..b5937fcb5 100644
--- a/test/fixture/sync/trailing.output.json
+++ b/test/fixture/sync/trailing.output.json
@@ -150,7 +150,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -311,7 +312,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -410,7 +412,8 @@
     "name": "Something",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/sync/typedef.output.json b/test/fixture/sync/typedef.output.json
index d1199fe40..0b4ed65f2 100644
--- a/test/fixture/sync/typedef.output.json
+++ b/test/fixture/sync/typedef.output.json
@@ -243,7 +243,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/system-import.output.json b/test/fixture/system-import.output.json
index ee6fd4cc9..0867306b0 100644
--- a/test/fixture/system-import.output.json
+++ b/test/fixture/system-import.output.json
@@ -150,7 +150,8 @@
     "kind": "function",
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/this-class.output.json b/test/fixture/this-class.output.json
index e6c5bf031..c2fbb41fd 100644
--- a/test/fixture/this-class.output.json
+++ b/test/fixture/this-class.output.json
@@ -44,7 +44,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
@@ -180,7 +181,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
@@ -332,7 +334,8 @@
           "scope": "instance",
           "members": {
             "instance": [],
-            "static": []
+            "static": [],
+            "events": []
           },
           "path": [
             {
diff --git a/test/fixture/type_application.output.json b/test/fixture/type_application.output.json
index 04ec75331..ce4194e12 100644
--- a/test/fixture/type_application.output.json
+++ b/test/fixture/type_application.output.json
@@ -178,7 +178,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/fixture/var-function-param-return.output.json b/test/fixture/var-function-param-return.output.json
index 3594637a0..6e5959cb4 100644
--- a/test/fixture/var-function-param-return.output.json
+++ b/test/fixture/var-function-param-return.output.json
@@ -48,7 +48,8 @@
     ],
     "members": {
       "instance": [],
-      "static": []
+      "static": [],
+      "events": []
     },
     "path": [
       {
diff --git a/test/lib/hierarchy.js b/test/lib/hierarchy.js
index 779d08c1a..18f07cf2b 100644
--- a/test/lib/hierarchy.js
+++ b/test/lib/hierarchy.js
@@ -49,7 +49,6 @@ test('hierarchy', function (t) {
      * @name event
      * @memberof Class
      * @kind event
-     * @instance
      */
   });