diff --git a/tests/PluginTestCase.php b/tests/PluginTestCase.php
index 9689c8790..06abaffc0 100644
--- a/tests/PluginTestCase.php
+++ b/tests/PluginTestCase.php
@@ -57,7 +57,7 @@ abstract class PluginTestCase extends Illuminate\Foundation\Testing\TestCase
      * Perform test case set up.
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         /*
          * Force reload of October singletons
@@ -95,7 +95,7 @@ abstract class PluginTestCase extends Illuminate\Foundation\Testing\TestCase
      * Flush event listeners and collect garbage.
      * @return void
      */
-    public function tearDown()
+    public function tearDown() : void
     {
         $this->flushModelEventListeners();
         parent::tearDown();
diff --git a/tests/unit/backend/traits/WidgetMakerTest.php b/tests/unit/backend/traits/WidgetMakerTest.php
index 657384221..cf9453abf 100644
--- a/tests/unit/backend/traits/WidgetMakerTest.php
+++ b/tests/unit/backend/traits/WidgetMakerTest.php
@@ -28,7 +28,7 @@ class WidgetMakerTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/cms/classes/CmsCompoundObjectTest.php b/tests/unit/cms/classes/CmsCompoundObjectTest.php
index 5d47553b3..58e9a5ef0 100644
--- a/tests/unit/cms/classes/CmsCompoundObjectTest.php
+++ b/tests/unit/cms/classes/CmsCompoundObjectTest.php
@@ -26,7 +26,7 @@ class TestTemporaryCmsCompoundObject extends CmsCompoundObject
 
 class CmsCompoundObjectTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         Model::clearBootedModels();
diff --git a/tests/unit/cms/classes/CmsObjectQueryTest.php b/tests/unit/cms/classes/CmsObjectQueryTest.php
index d43092332..4e19b55da 100644
--- a/tests/unit/cms/classes/CmsObjectQueryTest.php
+++ b/tests/unit/cms/classes/CmsObjectQueryTest.php
@@ -7,7 +7,7 @@ use October\Rain\Halcyon\Model;
 
 class CmsObjectQueryTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/cms/classes/CodeParserTest.php b/tests/unit/cms/classes/CodeParserTest.php
index 95ddc9095..8eeacd3ca 100644
--- a/tests/unit/cms/classes/CodeParserTest.php
+++ b/tests/unit/cms/classes/CodeParserTest.php
@@ -10,7 +10,7 @@ use Cms\Classes\Controller;
 
 class CodeParserTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setup();
 
diff --git a/tests/unit/cms/classes/ComponentManagerTest.php b/tests/unit/cms/classes/ComponentManagerTest.php
index a12255580..152367b8d 100644
--- a/tests/unit/cms/classes/ComponentManagerTest.php
+++ b/tests/unit/cms/classes/ComponentManagerTest.php
@@ -9,7 +9,7 @@ use Cms\Classes\ComponentManager;
 
 class ComponentManagerTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index 5ba899995..a0dbc5061 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -6,7 +6,7 @@ use October\Rain\Halcyon\Model;
 
 class ControllerTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/cms/classes/RouterTest.php b/tests/unit/cms/classes/RouterTest.php
index db378394e..0a32a9acf 100644
--- a/tests/unit/cms/classes/RouterTest.php
+++ b/tests/unit/cms/classes/RouterTest.php
@@ -7,7 +7,7 @@ class RouterTest extends TestCase
 {
     protected static $theme = null;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/cms/classes/ThemeTest.php b/tests/unit/cms/classes/ThemeTest.php
index e7410bbc3..b8594c496 100644
--- a/tests/unit/cms/classes/ThemeTest.php
+++ b/tests/unit/cms/classes/ThemeTest.php
@@ -4,7 +4,7 @@ use Cms\Classes\Theme;
 
 class ThemeTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/AttachManyModelTest.php b/tests/unit/plugins/database/AttachManyModelTest.php
index 79c03c443..9c316c032 100644
--- a/tests/unit/plugins/database/AttachManyModelTest.php
+++ b/tests/unit/plugins/database/AttachManyModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\User;
 
 class AttachManyModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/AttachOneModelTest.php b/tests/unit/plugins/database/AttachOneModelTest.php
index 52cb62fdf..d50debdb6 100644
--- a/tests/unit/plugins/database/AttachOneModelTest.php
+++ b/tests/unit/plugins/database/AttachOneModelTest.php
@@ -7,7 +7,7 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class AttachOneModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/BelongsToManyModelTest.php b/tests/unit/plugins/database/BelongsToManyModelTest.php
index e151d2304..e850b7752 100644
--- a/tests/unit/plugins/database/BelongsToManyModelTest.php
+++ b/tests/unit/plugins/database/BelongsToManyModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\Author;
 
 class BelongsToManyModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/BelongsToModelTest.php b/tests/unit/plugins/database/BelongsToModelTest.php
index 6d87dbd3a..8fca6ff06 100644
--- a/tests/unit/plugins/database/BelongsToModelTest.php
+++ b/tests/unit/plugins/database/BelongsToModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\Author;
 
 class BelongsToModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/DeferredBindingTest.php b/tests/unit/plugins/database/DeferredBindingTest.php
index b97f4fa99..a0e897aa8 100644
--- a/tests/unit/plugins/database/DeferredBindingTest.php
+++ b/tests/unit/plugins/database/DeferredBindingTest.php
@@ -6,7 +6,7 @@ use October\Rain\Database\Models\DeferredBinding;
 
 class DeferredBindingTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/HasManyModelTest.php b/tests/unit/plugins/database/HasManyModelTest.php
index 64559dbc1..9bb165e39 100644
--- a/tests/unit/plugins/database/HasManyModelTest.php
+++ b/tests/unit/plugins/database/HasManyModelTest.php
@@ -6,7 +6,7 @@ use October\Rain\Database\Collection;
 
 class HasManyModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/HasOneModelTest.php b/tests/unit/plugins/database/HasOneModelTest.php
index 7a5e30157..e6bd0f45e 100644
--- a/tests/unit/plugins/database/HasOneModelTest.php
+++ b/tests/unit/plugins/database/HasOneModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\Phone;
 
 class HasOneModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/ModelTest.php b/tests/unit/plugins/database/ModelTest.php
index 492b39505..4742b73b6 100644
--- a/tests/unit/plugins/database/ModelTest.php
+++ b/tests/unit/plugins/database/ModelTest.php
@@ -4,7 +4,7 @@ use Database\Tester\Models\Post;
 
 class ModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/MorphManyModelTest.php b/tests/unit/plugins/database/MorphManyModelTest.php
index e9b77aced..a7ba3041c 100644
--- a/tests/unit/plugins/database/MorphManyModelTest.php
+++ b/tests/unit/plugins/database/MorphManyModelTest.php
@@ -6,7 +6,7 @@ use October\Rain\Database\Collection;
 
 class MorphManyModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/MorphOneModelTest.php b/tests/unit/plugins/database/MorphOneModelTest.php
index 4051e0b0c..e8c6f60fd 100644
--- a/tests/unit/plugins/database/MorphOneModelTest.php
+++ b/tests/unit/plugins/database/MorphOneModelTest.php
@@ -6,7 +6,7 @@ use Database\Tester\Models\Meta;
 
 class MorphOneModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/MorphToModelTest.php b/tests/unit/plugins/database/MorphToModelTest.php
index 962f2d658..b0eb37ff7 100644
--- a/tests/unit/plugins/database/MorphToModelTest.php
+++ b/tests/unit/plugins/database/MorphToModelTest.php
@@ -6,7 +6,7 @@ use Database\Tester\Models\EventLog;
 
 class MorphToModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/NestedTreeModelTest.php b/tests/unit/plugins/database/NestedTreeModelTest.php
index b2f0ae019..49d46764c 100644
--- a/tests/unit/plugins/database/NestedTreeModelTest.php
+++ b/tests/unit/plugins/database/NestedTreeModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\CategoryNested;
 
 class NestedTreeModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/NullableModelTest.php b/tests/unit/plugins/database/NullableModelTest.php
index 0484409d4..9d6d61114 100644
--- a/tests/unit/plugins/database/NullableModelTest.php
+++ b/tests/unit/plugins/database/NullableModelTest.php
@@ -4,7 +4,7 @@ use Database\Tester\Models\NullablePost;
 
 class NullableModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/RevisionableModelTest.php b/tests/unit/plugins/database/RevisionableModelTest.php
index afee0c93d..c8fa19a54 100644
--- a/tests/unit/plugins/database/RevisionableModelTest.php
+++ b/tests/unit/plugins/database/RevisionableModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\RevisionablePost;
 
 class RevisionableModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/SimpleTreeModelTest.php b/tests/unit/plugins/database/SimpleTreeModelTest.php
index fac6a48f3..31389dc0b 100644
--- a/tests/unit/plugins/database/SimpleTreeModelTest.php
+++ b/tests/unit/plugins/database/SimpleTreeModelTest.php
@@ -5,7 +5,7 @@ use Database\Tester\Models\CategorySimple;
 
 class SimpleTreeModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/SluggableModelTest.php b/tests/unit/plugins/database/SluggableModelTest.php
index f1f7aac71..22cad1837 100644
--- a/tests/unit/plugins/database/SluggableModelTest.php
+++ b/tests/unit/plugins/database/SluggableModelTest.php
@@ -4,7 +4,7 @@ use Database\Tester\Models\SluggablePost;
 
 class SluggableModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/SoftDeleteModelTest.php b/tests/unit/plugins/database/SoftDeleteModelTest.php
index 1e96b8ce4..686ce4306 100644
--- a/tests/unit/plugins/database/SoftDeleteModelTest.php
+++ b/tests/unit/plugins/database/SoftDeleteModelTest.php
@@ -10,7 +10,7 @@ use Database\Tester\Models\UserWithSoftAuthorAndSoftDelete;
 
 class SoftDeleteModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/plugins/database/ValidationModelTest.php b/tests/unit/plugins/database/ValidationModelTest.php
index ce1f4e382..4eba6d02c 100644
--- a/tests/unit/plugins/database/ValidationModelTest.php
+++ b/tests/unit/plugins/database/ValidationModelTest.php
@@ -4,7 +4,7 @@ use Database\Tester\Models\ValidationPost;
 
 class ValidationModelTest extends PluginTestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/system/classes/CombineAssetsTest.php b/tests/unit/system/classes/CombineAssetsTest.php
index 60e639c94..66fbd56a9 100644
--- a/tests/unit/system/classes/CombineAssetsTest.php
+++ b/tests/unit/system/classes/CombineAssetsTest.php
@@ -5,7 +5,7 @@ use System\Classes\CombineAssets;
 
 class CombineAssetsTest extends TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/system/classes/MarkupManagerTest.php b/tests/unit/system/classes/MarkupManagerTest.php
index 405c933d8..057d9501f 100644
--- a/tests/unit/system/classes/MarkupManagerTest.php
+++ b/tests/unit/system/classes/MarkupManagerTest.php
@@ -5,7 +5,7 @@ use System\Classes\MarkupManager;
 class MarkupManagerTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/system/classes/PluginManagerTest.php b/tests/unit/system/classes/PluginManagerTest.php
index 1271fc247..de82f3c7f 100644
--- a/tests/unit/system/classes/PluginManagerTest.php
+++ b/tests/unit/system/classes/PluginManagerTest.php
@@ -5,7 +5,7 @@ use System\Classes\PluginManager;
 class PluginManagerTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/system/classes/VersionManagerTest.php b/tests/unit/system/classes/VersionManagerTest.php
index b9934d3e5..5681a5a67 100644
--- a/tests/unit/system/classes/VersionManagerTest.php
+++ b/tests/unit/system/classes/VersionManagerTest.php
@@ -5,7 +5,7 @@ use System\Classes\VersionManager;
 class VersionManagerTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
diff --git a/tests/unit/system/traits/AssetMakerTest.php b/tests/unit/system/traits/AssetMakerTest.php
index 352d66107..606df9562 100644
--- a/tests/unit/system/traits/AssetMakerTest.php
+++ b/tests/unit/system/traits/AssetMakerTest.php
@@ -10,7 +10,7 @@ class AssetMakerTest extends TestCase
 {
     private $stub;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->createApplication();
         $this->stub = new AssetMakerStub();