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/ComponentGroupWasAddedTest.php b/tests/Events/ComponentGroup/ComponentGroupWasAddedTest.php
new file mode 100644
index 00000000..3c09df27
--- /dev/null
+++ b/tests/Events/ComponentGroup/ComponentGroupWasAddedTest.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/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];
+    }
+}