diff --git a/tests/Bus/Events/System/AbstractSystemEventTestCase.php b/tests/Bus/Events/System/AbstractSystemEventTestCase.php
new file mode 100644
index 000000000000..b500edcc3c3e
--- /dev/null
+++ b/tests/Bus/Events/System/AbstractSystemEventTestCase.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\Bus\Events\System;
+
+use AltThree\TestBench\EventTrait;
+use CachetHQ\Cachet\Bus\Events\System\SystemEventInterface;
+use CachetHQ\Tests\Cachet\AbstractTestCase;
+
+/**
+ * This is the abstract system event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+abstract class AbstractSystemEventTestCase extends AbstractTestCase
+{
+    use EventTrait;
+
+    protected function getEventInterfaces()
+    {
+        return [SystemEventInterface::class];
+    }
+}
diff --git a/tests/Bus/Events/System/SystemCheckedForUpdatesEventTest.php b/tests/Bus/Events/System/SystemCheckedForUpdatesEventTest.php
new file mode 100644
index 000000000000..45db84cdfd16
--- /dev/null
+++ b/tests/Bus/Events/System/SystemCheckedForUpdatesEventTest.php
@@ -0,0 +1,35 @@
+<?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\Bus\Events\System;
+
+use CachetHQ\Cachet\Bus\Events\System\SystemCheckedForUpdatesEvent;
+
+/**
+ * This is the system checked for updates event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SystemCheckedForUpdatesEventTest extends AbstractSystemEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = [];
+        $object = new SystemCheckedForUpdatesEvent();
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/System/SystemWasInstalledEventTest.php b/tests/Bus/Events/System/SystemWasInstalledEventTest.php
new file mode 100644
index 000000000000..1cdd08415d89
--- /dev/null
+++ b/tests/Bus/Events/System/SystemWasInstalledEventTest.php
@@ -0,0 +1,35 @@
+<?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\Bus\Events\System;
+
+use CachetHQ\Cachet\Bus\Events\System\SystemWasInstalledEvent;
+
+/**
+ * This is the system was installed event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SystemWasInstalledEventTest extends AbstractSystemEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = [];
+        $object = new SystemWasInstalledEvent();
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/System/SystemWasResetEventTest.php b/tests/Bus/Events/System/SystemWasResetEventTest.php
new file mode 100644
index 000000000000..35e593af464e
--- /dev/null
+++ b/tests/Bus/Events/System/SystemWasResetEventTest.php
@@ -0,0 +1,35 @@
+<?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\Bus\Events\System;
+
+use CachetHQ\Cachet\Bus\Events\System\SystemWasResetEvent;
+
+/**
+ * This is the system was reset event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SystemWasResetEventTest extends AbstractSystemEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = [];
+        $object = new SystemWasResetEvent();
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/System/SystemWasUpdatedEventTest.php b/tests/Bus/Events/System/SystemWasUpdatedEventTest.php
new file mode 100644
index 000000000000..2d89a4edbb3e
--- /dev/null
+++ b/tests/Bus/Events/System/SystemWasUpdatedEventTest.php
@@ -0,0 +1,35 @@
+<?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\Bus\Events\System;
+
+use CachetHQ\Cachet\Bus\Events\System\SystemWasUpdatedEvent;
+
+/**
+ * This is the system was updated event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class SystemWasUpdatedEventTest extends AbstractSystemEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = [];
+        $object = new SystemWasUpdatedEvent();
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserDisabledTwoAuthEventTest.php b/tests/Bus/Events/User/UserDisabledTwoAuthEventTest.php
new file mode 100644
index 000000000000..464c4181c5d3
--- /dev/null
+++ b/tests/Bus/Events/User/UserDisabledTwoAuthEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserDisabledTwoAuthEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user disabled two auth event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserDisabledTwoAuthEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserDisabledTwoAuthEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserEnabledTwoAuthEventTest.php b/tests/Bus/Events/User/UserEnabledTwoAuthEventTest.php
new file mode 100644
index 000000000000..0583ff74d32d
--- /dev/null
+++ b/tests/Bus/Events/User/UserEnabledTwoAuthEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserEnabledTwoAuthEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user enabled two auth event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserEnabledTwoAuthEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserEnabledTwoAuthEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserFailedTwoAuthEventTest.php b/tests/Bus/Events/User/UserFailedTwoAuthEventTest.php
new file mode 100644
index 000000000000..4f892a242151
--- /dev/null
+++ b/tests/Bus/Events/User/UserFailedTwoAuthEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserFailedTwoAuthEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user failed two auth event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserFailedTwoAuthEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserFailedTwoAuthEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserLoggedInEventTest.php b/tests/Bus/Events/User/UserLoggedInEventTest.php
new file mode 100644
index 000000000000..a8f9f84a7d81
--- /dev/null
+++ b/tests/Bus/Events/User/UserLoggedInEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserLoggedInEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user logged in event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserLoggedInEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserLoggedInEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserLoggedOutEventTest.php b/tests/Bus/Events/User/UserLoggedOutEventTest.php
new file mode 100644
index 000000000000..34c16980427c
--- /dev/null
+++ b/tests/Bus/Events/User/UserLoggedOutEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserLoggedOutEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user logged out event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserLoggedOutEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserLoggedOutEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserPassedTwoAuthEventTest.php b/tests/Bus/Events/User/UserPassedTwoAuthEventTest.php
new file mode 100644
index 000000000000..d03dca4be733
--- /dev/null
+++ b/tests/Bus/Events/User/UserPassedTwoAuthEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserPassedTwoAuthEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user passed two auth event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserPassedTwoAuthEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserPassedTwoAuthEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}
diff --git a/tests/Bus/Events/User/UserRegeneratedApiTokenEventTest.php b/tests/Bus/Events/User/UserRegeneratedApiTokenEventTest.php
new file mode 100644
index 000000000000..98a3b72de66a
--- /dev/null
+++ b/tests/Bus/Events/User/UserRegeneratedApiTokenEventTest.php
@@ -0,0 +1,36 @@
+<?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\Bus\Events\User;
+
+use CachetHQ\Cachet\Bus\Events\User\UserRegeneratedApiTokenEvent;
+use CachetHQ\Cachet\Models\User;
+
+/**
+ * This is the user regenerated api token event test class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class UserRegeneratedApiTokenEventTest extends AbstractUserEventTestCase
+{
+    protected function objectHasHandlers()
+    {
+        return false;
+    }
+
+    protected function getObjectAndParams()
+    {
+        $params = ['user' => new User()];
+        $object = new UserRegeneratedApiTokenEvent($params['user']);
+
+        return compact('params', 'object');
+    }
+}