diff --git a/app/Events/Component/ComponentEventInterface.php b/app/Events/Component/ComponentEventInterface.php
new file mode 100644
index 00000000..1bdf1e64
--- /dev/null
+++ b/app/Events/Component/ComponentEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface ComponentEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/Component/ComponentWasAddedEvent.php b/app/Events/Component/ComponentWasAddedEvent.php
index 5629642d..74dfbdf0 100644
--- a/app/Events/Component/ComponentWasAddedEvent.php
+++ b/app/Events/Component/ComponentWasAddedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasAddedEvent
+class ComponentWasAddedEvent implements ComponentEventInterface
 {
     /**
      * The component that was added.
diff --git a/app/Events/Component/ComponentWasRemovedEvent.php b/app/Events/Component/ComponentWasRemovedEvent.php
index e2280f21..3e1677fb 100644
--- a/app/Events/Component/ComponentWasRemovedEvent.php
+++ b/app/Events/Component/ComponentWasRemovedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasRemovedEvent
+class ComponentWasRemovedEvent implements ComponentEventInterface
 {
     /**
      * The component that was removed.
diff --git a/app/Events/Component/ComponentWasUpdatedEvent.php b/app/Events/Component/ComponentWasUpdatedEvent.php
index 7e776f09..341ba329 100644
--- a/app/Events/Component/ComponentWasUpdatedEvent.php
+++ b/app/Events/Component/ComponentWasUpdatedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Component;
 
 use CachetHQ\Cachet\Models\Component;
 
-class ComponentWasUpdatedEvent
+class ComponentWasUpdatedEvent implements ComponentEventInterface
 {
     /**
      * The component that was updated.
diff --git a/app/Events/ComponentGroup/ComponentGroupEventInterface.php b/app/Events/ComponentGroup/ComponentGroupEventInterface.php
new file mode 100644
index 00000000..24fa6d0d
--- /dev/null
+++ b/app/Events/ComponentGroup/ComponentGroupEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface ComponentGroupEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php b/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php
index d76174d0..f5492f94 100644
--- a/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php
+++ b/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasAddedEvent
+class ComponentGroupWasAddedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was added.
diff --git a/app/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php b/app/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php
index 07913871..de57f607 100644
--- a/app/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php
+++ b/app/Events/ComponentGroup/ComponentGroupWasRemovedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasRemovedEvent
+class ComponentGroupWasRemovedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was removed.
diff --git a/app/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php b/app/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php
index 400444d9..c4487131 100644
--- a/app/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php
+++ b/app/Events/ComponentGroup/ComponentGroupWasUpdatedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\ComponentGroup;
 
 use CachetHQ\Cachet\Models\ComponentGroup;
 
-class ComponentGroupWasUpdatedEvent
+class ComponentGroupWasUpdatedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was updated.
diff --git a/app/Events/EventInterface.php b/app/Events/EventInterface.php
new file mode 100644
index 00000000..44d7a044
--- /dev/null
+++ b/app/Events/EventInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events;
+
+interface EventInterface
+{
+    //
+}
diff --git a/app/Events/Incident/IncidentEventInterface.php b/app/Events/Incident/IncidentEventInterface.php
new file mode 100644
index 00000000..04ac190b
--- /dev/null
+++ b/app/Events/Incident/IncidentEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Incident;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface IncidentEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/Incident/IncidentWasRemovedEvent.php b/app/Events/Incident/IncidentWasRemovedEvent.php
index cab1a30f..0d888c73 100644
--- a/app/Events/Incident/IncidentWasRemovedEvent.php
+++ b/app/Events/Incident/IncidentWasRemovedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class IncidentWasRemovedEvent
+class IncidentWasRemovedEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been removed.
diff --git a/app/Events/Incident/IncidentWasReportedEvent.php b/app/Events/Incident/IncidentWasReportedEvent.php
index 3c15e0bf..8a82792c 100644
--- a/app/Events/Incident/IncidentWasReportedEvent.php
+++ b/app/Events/Incident/IncidentWasReportedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class IncidentWasReportedEvent
+class IncidentWasReportedEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been reported.
diff --git a/app/Events/Incident/IncidentWasUpdatedEvent.php b/app/Events/Incident/IncidentWasUpdatedEvent.php
index 7979e62b..73815b2e 100644
--- a/app/Events/Incident/IncidentWasUpdatedEvent.php
+++ b/app/Events/Incident/IncidentWasUpdatedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class IncidentWasUpdatedEvent
+class IncidentWasUpdatedEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been updated.
diff --git a/app/Events/Incident/MaintenanceWasScheduledEvent.php b/app/Events/Incident/MaintenanceWasScheduledEvent.php
index fcd0aaaf..bc3cf27e 100644
--- a/app/Events/Incident/MaintenanceWasScheduledEvent.php
+++ b/app/Events/Incident/MaintenanceWasScheduledEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Incident;
 
 use CachetHQ\Cachet\Models\Incident;
 
-class MaintenanceWasScheduledEvent
+class MaintenanceWasScheduledEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been reported.
diff --git a/app/Events/Invite/InviteEventInterface.php b/app/Events/Invite/InviteEventInterface.php
new file mode 100644
index 00000000..50f60e35
--- /dev/null
+++ b/app/Events/Invite/InviteEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Invite;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface InviteEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/Invite/InviteWasClaimed.php b/app/Events/Invite/InviteWasClaimed.php
index 18e89e9a..9c7dfcb3 100644
--- a/app/Events/Invite/InviteWasClaimed.php
+++ b/app/Events/Invite/InviteWasClaimed.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Invite;
 
 use CachetHQ\Cachet\Models\Invite;
 
-final class InviteWasClaimed
+final class InviteWasClaimed implements InviteEventInterface
 {
     /**
      * The invite that has been claimed.
diff --git a/app/Events/Metric/MetricEventInterface.php b/app/Events/Metric/MetricEventInterface.php
new file mode 100644
index 00000000..ad0b0671
--- /dev/null
+++ b/app/Events/Metric/MetricEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface MetricEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/Metric/MetricPointWasAddedEvent.php b/app/Events/Metric/MetricPointWasAddedEvent.php
index e5b47b77..2fe4a294 100644
--- a/app/Events/Metric/MetricPointWasAddedEvent.php
+++ b/app/Events/Metric/MetricPointWasAddedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasAddedEvent
+class MetricPointWasAddedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was added.
diff --git a/app/Events/Metric/MetricPointWasRemovedEvent.php b/app/Events/Metric/MetricPointWasRemovedEvent.php
index 6315749b..a91ee78c 100644
--- a/app/Events/Metric/MetricPointWasRemovedEvent.php
+++ b/app/Events/Metric/MetricPointWasRemovedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasRemovedEvent
+class MetricPointWasRemovedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was removed.
diff --git a/app/Events/Metric/MetricPointWasUpdatedEvent.php b/app/Events/Metric/MetricPointWasUpdatedEvent.php
index a1275d66..ced26d84 100644
--- a/app/Events/Metric/MetricPointWasUpdatedEvent.php
+++ b/app/Events/Metric/MetricPointWasUpdatedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\MetricPoint;
 
-class MetricPointWasUpdatedEvent
+class MetricPointWasUpdatedEvent implements MetricEventInterface
 {
     /**
      * The metric point that was updated.
diff --git a/app/Events/Metric/MetricWasAddedEvent.php b/app/Events/Metric/MetricWasAddedEvent.php
index b579e7ad..293ccd85 100644
--- a/app/Events/Metric/MetricWasAddedEvent.php
+++ b/app/Events/Metric/MetricWasAddedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasAddedEvent
+class MetricWasAddedEvent implements MetricEventInterface
 {
     /**
      * The metric that was added.
diff --git a/app/Events/Metric/MetricWasRemovedEvent.php b/app/Events/Metric/MetricWasRemovedEvent.php
index 41c5c63e..fd948156 100644
--- a/app/Events/Metric/MetricWasRemovedEvent.php
+++ b/app/Events/Metric/MetricWasRemovedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasRemovedEvent
+class MetricWasRemovedEvent implements MetricEventInterface
 {
     /**
      * The metric that was removed.
diff --git a/app/Events/Metric/MetricWasUpdatedEvent.php b/app/Events/Metric/MetricWasUpdatedEvent.php
index 0cdcf0de..1acc84c2 100644
--- a/app/Events/Metric/MetricWasUpdatedEvent.php
+++ b/app/Events/Metric/MetricWasUpdatedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Metric;
 
 use CachetHQ\Cachet\Models\Metric;
 
-class MetricWasUpdatedEvent
+class MetricWasUpdatedEvent implements MetricEventInterface
 {
     /**
      * The metric that was updated.
diff --git a/app/Events/Subscriber/SubscriberEventInterface.php b/app/Events/Subscriber/SubscriberEventInterface.php
new file mode 100644
index 00000000..4f4324dc
--- /dev/null
+++ b/app/Events/Subscriber/SubscriberEventInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface SubscriberEventInterface extends EventInterface
+{
+    //
+}
diff --git a/app/Events/Subscriber/SubscriberHasSubscribedEvent.php b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
index 5808ae4a..dcf794fd 100644
--- a/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasSubscribedEvent
+class SubscriberHasSubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has subscribed.
diff --git a/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
index e7738f46..12feb11c 100644
--- a/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasUnsubscribedEvent
+class SubscriberHasUnsubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has unsubscribed.
diff --git a/app/Events/Subscriber/SubscriberHasVerifiedEvent.php b/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
index 0d072f12..dc4af55c 100644
--- a/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Subscriber;
 
 use CachetHQ\Cachet\Models\Subscriber;
 
-class SubscriberHasVerifiedEvent
+class SubscriberHasVerifiedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has verified.
diff --git a/app/Events/User/UserEventInterface.php b/app/Events/User/UserEventInterface.php
index f9f88df3..06527bd8 100644
--- a/app/Events/User/UserEventInterface.php
+++ b/app/Events/User/UserEventInterface.php
@@ -11,7 +11,9 @@
 
 namespace CachetHQ\Cachet\Events\User;
 
-interface UserEventInterface
+use CachetHQ\Cachet\Events\EventInterface;
+
+interface UserEventInterface extends EventInterface
 {
     //
 }