diff --git a/app/Events/Component/ComponentWasAddedEvent.php b/app/Events/Component/ComponentWasAddedEvent.php
index c3332161..7aacd7e6 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 implements ComponentEventInterface
+final class ComponentWasAddedEvent implements ComponentEventInterface
 {
     /**
      * The component that was added.
diff --git a/app/Events/Component/ComponentWasRemovedEvent.php b/app/Events/Component/ComponentWasRemovedEvent.php
index 6c28bca4..838e9c93 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 implements ComponentEventInterface
+final class ComponentWasRemovedEvent implements ComponentEventInterface
 {
     /**
      * The component that was removed.
diff --git a/app/Events/Component/ComponentWasUpdatedEvent.php b/app/Events/Component/ComponentWasUpdatedEvent.php
index 4d3daecb..5a2b626b 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 implements ComponentEventInterface
+final class ComponentWasUpdatedEvent implements ComponentEventInterface
 {
     /**
      * The component that was updated.
diff --git a/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php b/app/Events/ComponentGroup/ComponentGroupWasAddedEvent.php
index b6760be1..868b7d0e 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 implements ComponentGroupEventInterface
+final 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 b32c9e45..4231ed88 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 implements ComponentGroupEventInterface
+final 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 c70a3165..8eb58d7e 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 implements ComponentGroupEventInterface
+final class ComponentGroupWasUpdatedEvent implements ComponentGroupEventInterface
 {
     /**
      * The component group that was updated.
diff --git a/app/Events/Incident/IncidentWasRemovedEvent.php b/app/Events/Incident/IncidentWasRemovedEvent.php
index 2ea4934f..a53060a2 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 implements IncidentEventInterface
+final 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 00eb6930..a791dd8f 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 implements IncidentEventInterface
+final 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 a5352b28..52b847d0 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 implements IncidentEventInterface
+final 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 688940be..7ccce3e2 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 implements IncidentEventInterface
+final class MaintenanceWasScheduledEvent implements IncidentEventInterface
 {
     /**
      * The incident that has been reported.
diff --git a/app/Events/Invite/InviteWasClaimed.php b/app/Events/Invite/InviteWasClaimedEvent.php
similarity index 90%
rename from app/Events/Invite/InviteWasClaimed.php
rename to app/Events/Invite/InviteWasClaimedEvent.php
index 9c7dfcb3..77c562ab 100644
--- a/app/Events/Invite/InviteWasClaimed.php
+++ b/app/Events/Invite/InviteWasClaimedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\Invite;
 
 use CachetHQ\Cachet\Models\Invite;
 
-final class InviteWasClaimed implements InviteEventInterface
+final class InviteWasClaimedEvent implements InviteEventInterface
 {
     /**
      * The invite that has been claimed.
diff --git a/app/Events/Metric/MetricPointWasAddedEvent.php b/app/Events/Metric/MetricPointWasAddedEvent.php
index d2c8a2b3..e081f024 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 implements MetricEventInterface
+final 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 7b919495..18a83051 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 implements MetricEventInterface
+final 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 ce2ea986..d1d9e0b0 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 implements MetricEventInterface
+final 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 bbc14664..c097f090 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 implements MetricEventInterface
+final class MetricWasAddedEvent implements MetricEventInterface
 {
     /**
      * The metric that was added.
diff --git a/app/Events/Metric/MetricWasRemovedEvent.php b/app/Events/Metric/MetricWasRemovedEvent.php
index bd78e43d..abbff8c0 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 implements MetricEventInterface
+final class MetricWasRemovedEvent implements MetricEventInterface
 {
     /**
      * The metric that was removed.
diff --git a/app/Events/Metric/MetricWasUpdatedEvent.php b/app/Events/Metric/MetricWasUpdatedEvent.php
index 8dc1de20..b3343aad 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 implements MetricEventInterface
+final class MetricWasUpdatedEvent implements MetricEventInterface
 {
     /**
      * The metric that was updated.
diff --git a/app/Events/Subscriber/SubscriberHasSubscribedEvent.php b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
index 26cd90f7..964f7f61 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 implements SubscriberEventInterface
+final class SubscriberHasSubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has subscribed.
diff --git a/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
index bb428577..77beed3d 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 implements SubscriberEventInterface
+final class SubscriberHasUnsubscribedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has unsubscribed.
diff --git a/app/Events/Subscriber/SubscriberHasVerifiedEvent.php b/app/Events/Subscriber/SubscriberHasVerifiedEvent.php
index a99fdb76..08644a41 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 implements SubscriberEventInterface
+final class SubscriberHasVerifiedEvent implements SubscriberEventInterface
 {
     /**
      * The subscriber who has verified.
diff --git a/app/Events/User/UserWasInvitedEvent.php b/app/Events/User/UserWasInvitedEvent.php
index 2671c10d..bf16b6df 100644
--- a/app/Events/User/UserWasInvitedEvent.php
+++ b/app/Events/User/UserWasInvitedEvent.php
@@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Events\User;
 
 use CachetHQ\Cachet\Models\Invite;
 
-final class UserWasInvitedEvent
+final class UserWasInvitedEvent implements UserEventInterface
 {
     /**
      * The invite that has been added.
diff --git a/app/Foundation/Providers/EventServiceProvider.php b/app/Foundation/Providers/EventServiceProvider.php
index 19bc687a..e5597efb 100644
--- a/app/Foundation/Providers/EventServiceProvider.php
+++ b/app/Foundation/Providers/EventServiceProvider.php
@@ -21,15 +21,60 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
+        'CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasAddedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasRemovedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasUpdatedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Component\ComponentWasAddedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Component\ComponentWasRemovedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Component\ComponentWasUpdatedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent' => [
             'CachetHQ\Cachet\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',
         ],
         'CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent' => [
             'CachetHQ\Cachet\Handlers\Events\Incident\SendMaintenanceEmailNotificationHandler',
         ],
+        'CachetHQ\Cachet\Events\Invite\InviteWasClaimedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricPointWasAddedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricPointWasRemovedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricPointWasUpdatedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricWasAddedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricWasRemovedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Metric\MetricWasUpdatedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent' => [
             'CachetHQ\Cachet\Handlers\Events\Subscriber\SendSubscriberVerificationEmailHandler',
         ],
+        'CachetHQ\Cachet\Events\Subscriber\SubscriberHasUnsubscribedEvent' => [
+            //
+        ],
+        'CachetHQ\Cachet\Events\Subscriber\SubscriberHasVerifiedEvent' => [
+            //
+        ],
         'CachetHQ\Cachet\Events\User\UserWasAddedEvent' => [
             //
         ],
diff --git a/tests/Events/Component/AbstractComponentEventTestCase.php b/tests/Events/Component/AbstractComponentEventTestCase.php
new file mode 100644
index 00000000..54ee9343
--- /dev/null
+++ b/tests/Events/Component/AbstractComponentEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\Component;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\Component\ComponentEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractComponentEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [ComponentEventInterface::class];
+    }
+}
diff --git a/tests/Events/Component/ComponentWasAddedEventTest.php b/tests/Events/Component/ComponentWasAddedEventTest.php
new file mode 100644
index 00000000..ae3fcef5
--- /dev/null
+++ b/tests/Events/Component/ComponentWasAddedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Events\Component\ComponentWasAddedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasAddedEventTest extends AbstractComponentEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['component' => new Component()];
+        $object = new ComponentWasAddedEvent($params['component']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Component/ComponentWasRemovedEventTest.php b/tests/Events/Component/ComponentWasRemovedEventTest.php
new file mode 100644
index 00000000..de88abb0
--- /dev/null
+++ b/tests/Events/Component/ComponentWasRemovedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Events\Component\ComponentWasRemovedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasRemovedEventTest extends AbstractComponentEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['component' => new Component()];
+        $object = new ComponentWasRemovedEvent($params['component']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Component/ComponentWasUpdatedEventTest.php b/tests/Events/Component/ComponentWasUpdatedEventTest.php
new file mode 100644
index 00000000..b1fa0c1d
--- /dev/null
+++ b/tests/Events/Component/ComponentWasUpdatedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Component;
+
+use CachetHQ\Cachet\Events\Component\ComponentWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Component;
+
+class ComponentWasUpdatedEventTest extends AbstractComponentEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['component' => new Component()];
+        $object = new ComponentWasUpdatedEvent($params['component']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/ComponentGroup/AbstractComponentGroupEventTestCase.php b/tests/Events/ComponentGroup/AbstractComponentGroupEventTestCase.php
new file mode 100644
index 00000000..c25d349c
--- /dev/null
+++ b/tests/Events/ComponentGroup/AbstractComponentGroupEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\ComponentGroup;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractComponentGroupEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [ComponentGroupEventInterface::class];
+    }
+}
diff --git a/tests/Events/ComponentGroup/ComponentGroupWasAddedEventTest.php b/tests/Events/ComponentGroup/ComponentGroupWasAddedEventTest.php
new file mode 100644
index 00000000..3c09df27
--- /dev/null
+++ b/tests/Events/ComponentGroup/ComponentGroupWasAddedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasAddedEvent;
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasAddedEventTest extends AbstractComponentGroupEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['group' => new ComponentGroup()];
+        $object = new ComponentGroupWasAddedEvent($params['group']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/ComponentGroup/ComponentGroupWasRemovedEventTest.php b/tests/Events/ComponentGroup/ComponentGroupWasRemovedEventTest.php
new file mode 100644
index 00000000..7a0697b9
--- /dev/null
+++ b/tests/Events/ComponentGroup/ComponentGroupWasRemovedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasRemovedEvent;
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasRemovedEventTest extends AbstractComponentGroupEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['group' => new ComponentGroup()];
+        $object = new ComponentGroupWasRemovedEvent($params['group']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/ComponentGroup/ComponentGroupWasUpdatedEventTest.php b/tests/Events/ComponentGroup/ComponentGroupWasUpdatedEventTest.php
new file mode 100644
index 00000000..e4159597
--- /dev/null
+++ b/tests/Events/ComponentGroup/ComponentGroupWasUpdatedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\ComponentGroup;
+
+use CachetHQ\Cachet\Events\ComponentGroup\ComponentGroupWasUpdatedEvent;
+use CachetHQ\Cachet\Models\ComponentGroup;
+
+class ComponentGroupWasUpdatedEventTest extends AbstractComponentGroupEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['group' => new ComponentGroup()];
+        $object = new ComponentGroupWasUpdatedEvent($params['group']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Incident/AbstractIncidentEventTestCase.php b/tests/Events/Incident/AbstractIncidentEventTestCase.php
new file mode 100644
index 00000000..def965a7
--- /dev/null
+++ b/tests/Events/Incident/AbstractIncidentEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\Incident;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\Incident\IncidentEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractIncidentEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [IncidentEventInterface::class];
+    }
+}
diff --git a/tests/Events/Invite/AbstractInviteEventTestCase.php b/tests/Events/Invite/AbstractInviteEventTestCase.php
new file mode 100644
index 00000000..28e9529b
--- /dev/null
+++ b/tests/Events/Invite/AbstractInviteEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\Invite;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\Invite\InviteEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractInviteEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [InviteEventInterface::class];
+    }
+}
diff --git a/tests/Events/Invite/InviteWasClaimedEventTest.php b/tests/Events/Invite/InviteWasClaimedEventTest.php
new file mode 100644
index 00000000..358c55e9
--- /dev/null
+++ b/tests/Events/Invite/InviteWasClaimedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Invite;
+
+use CachetHQ\Cachet\Events\Invite\InviteWasClaimedEvent;
+use CachetHQ\Cachet\Models\Invite;
+
+class InviteWasClaimedEventTest extends AbstractInviteEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['invite' => new Invite()];
+        $object = new InviteWasClaimedEvent($params['invite']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Metric/AbstractMetricEventTestCase.php b/tests/Events/Metric/AbstractMetricEventTestCase.php
new file mode 100644
index 00000000..990dbe2f
--- /dev/null
+++ b/tests/Events/Metric/AbstractMetricEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\Metric;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\Metric\MetricEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractMetricEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [MetricEventInterface::class];
+    }
+}
diff --git a/tests/Events/Metric/MetricWasAddedEventTest.php b/tests/Events/Metric/MetricWasAddedEventTest.php
new file mode 100644
index 00000000..0ca1bcfa
--- /dev/null
+++ b/tests/Events/Metric/MetricWasAddedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Events\Metric\MetricWasAddedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasAddedEventTest extends AbstractMetricEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['metric' => new Metric()];
+        $object = new MetricWasAddedEvent($params['metric']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Metric/MetricWasRemovedEventTest.php b/tests/Events/Metric/MetricWasRemovedEventTest.php
new file mode 100644
index 00000000..f019538f
--- /dev/null
+++ b/tests/Events/Metric/MetricWasRemovedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Events\Metric\MetricWasRemovedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasRemovedEventTest extends AbstractMetricEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['metric' => new Metric()];
+        $object = new MetricWasRemovedEvent($params['metric']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Metric/MetricWasUpdatedEventTest.php b/tests/Events/Metric/MetricWasUpdatedEventTest.php
new file mode 100644
index 00000000..9ccb9d66
--- /dev/null
+++ b/tests/Events/Metric/MetricWasUpdatedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Metric;
+
+use CachetHQ\Cachet\Events\Metric\MetricWasUpdatedEvent;
+use CachetHQ\Cachet\Models\Metric;
+
+class MetricWasUpdatedEventTest extends AbstractMetricEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['metric' => new Metric()];
+        $object = new MetricWasUpdatedEvent($params['metric']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Subscriber/AbstractSubscriberEventTestCase.php b/tests/Events/Subscriber/AbstractSubscriberEventTestCase.php
new file mode 100644
index 00000000..a776bd62
--- /dev/null
+++ b/tests/Events/Subscriber/AbstractSubscriberEventTestCase.php
@@ -0,0 +1,26 @@
+<?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\Tests\Cachet\Events\Subscriber;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+abstract class AbstractSubscriberEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [SubscriberEventInterface::class];
+    }
+}
diff --git a/tests/Events/Subscriber/SubscriberHasSubscribedEventTest.php b/tests/Events/Subscriber/SubscriberHasSubscribedEventTest.php
new file mode 100644
index 00000000..083ed8ab
--- /dev/null
+++ b/tests/Events/Subscriber/SubscriberHasSubscribedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+
+class SubscriberHasSubscribedEventTest extends AbstractSubscriberEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return true;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['subscriber' => new Subscriber()];
+        $object = new SubscriberHasSubscribedEvent($params['subscriber']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Subscriber/SubscriberHasUnsubscribedEventTest.php b/tests/Events/Subscriber/SubscriberHasUnsubscribedEventTest.php
new file mode 100644
index 00000000..4f1f470c
--- /dev/null
+++ b/tests/Events/Subscriber/SubscriberHasUnsubscribedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasUnsubscribedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+
+class SubscriberHasUnsubscribedEventTest extends AbstractSubscriberEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['subscriber' => new Subscriber()];
+        $object = new SubscriberHasUnsubscribedEvent($params['subscriber']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Events/Subscriber/SubscriberHasVerifiedEventTest.php b/tests/Events/Subscriber/SubscriberHasVerifiedEventTest.php
new file mode 100644
index 00000000..6486f2f9
--- /dev/null
+++ b/tests/Events/Subscriber/SubscriberHasVerifiedEventTest.php
@@ -0,0 +1,31 @@
+<?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\Tests\Cachet\Events\Subscriber;
+
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasVerifiedEvent;
+use CachetHQ\Cachet\Models\Subscriber;
+
+class SubscriberHasVerifiedEventTest extends AbstractSubscriberEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['subscriber' => new Subscriber()];
+        $object = new SubscriberHasVerifiedEvent($params['subscriber']);
+
+        return compact('params', 'object');
+    }
+}