diff --git a/.styleci.yml b/.styleci.yml
index a1b99be9..547c3853 100644
--- a/.styleci.yml
+++ b/.styleci.yml
@@ -1,6 +1,7 @@
 preset: laravel
 enabled:
 - native_function_invocation
+- declare_strict_types
 disabled:
 - concat_without_spaces
 - ternary_operator_spaces
diff --git a/assets/config.php b/assets/config.php
index c836ca39..79dec526 100644
--- a/assets/config.php
+++ b/assets/config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     'storage_driver' => 'Stancl\Tenancy\StorageDrivers\DatabaseStorageDriver',
     'storage' => [
diff --git a/assets/migrations/2019_08_08_000000_create_tenants_table.php b/assets/migrations/2019_08_08_000000_create_tenants_table.php
index 35158a88..f3de166a 100644
--- a/assets/migrations/2019_08_08_000000_create_tenants_table.php
+++ b/assets/migrations/2019_08_08_000000_create_tenants_table.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
diff --git a/src/CacheManager.php b/src/CacheManager.php
index 52952fe7..286723d0 100644
--- a/src/CacheManager.php
+++ b/src/CacheManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Illuminate\Cache\CacheManager as BaseCacheManager;
diff --git a/src/Commands/Install.php b/src/Commands/Install.php
index d05495b3..c536495f 100644
--- a/src/Commands/Install.php
+++ b/src/Commands/Install.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php
index 11d885c3..30290335 100644
--- a/src/Commands/Migrate.php
+++ b/src/Commands/Migrate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/Commands/Rollback.php b/src/Commands/Rollback.php
index 6f66f4d8..8ec52459 100644
--- a/src/Commands/Rollback.php
+++ b/src/Commands/Rollback.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/Commands/Run.php b/src/Commands/Run.php
index 97c1a6bb..2762cb66 100644
--- a/src/Commands/Run.php
+++ b/src/Commands/Run.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php
index a2be37da..9acbee7b 100644
--- a/src/Commands/Seed.php
+++ b/src/Commands/Seed.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Stancl\Tenancy\DatabaseManager;
diff --git a/src/Commands/TenantList.php b/src/Commands/TenantList.php
index a1d2b049..2db3cdd1 100644
--- a/src/Commands/TenantList.php
+++ b/src/Commands/TenantList.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/Controllers/TenantAssetsController.php b/src/Controllers/TenantAssetsController.php
index 225231f8..736a5766 100644
--- a/src/Controllers/TenantAssetsController.php
+++ b/src/Controllers/TenantAssetsController.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Controllers;
 
 use Illuminate\Routing\Controller;
diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php
index 3656419f..a0c551ec 100644
--- a/src/DatabaseManager.php
+++ b/src/DatabaseManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
diff --git a/src/Exceptions/CannotChangeUuidOrDomainException.php b/src/Exceptions/CannotChangeUuidOrDomainException.php
index 52817767..2016862a 100644
--- a/src/Exceptions/CannotChangeUuidOrDomainException.php
+++ b/src/Exceptions/CannotChangeUuidOrDomainException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Exceptions;
 
 class CannotChangeUuidOrDomainException extends \Exception
diff --git a/src/Exceptions/DatabaseManagerNotRegisteredException.php b/src/Exceptions/DatabaseManagerNotRegisteredException.php
index f836c943..e992ccd3 100644
--- a/src/Exceptions/DatabaseManagerNotRegisteredException.php
+++ b/src/Exceptions/DatabaseManagerNotRegisteredException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Exceptions;
 
 class DatabaseManagerNotRegisteredException extends \Exception
diff --git a/src/Exceptions/PhpRedisNotInstalledException.php b/src/Exceptions/PhpRedisNotInstalledException.php
index 6c9da3e7..e5e790f2 100644
--- a/src/Exceptions/PhpRedisNotInstalledException.php
+++ b/src/Exceptions/PhpRedisNotInstalledException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Exceptions;
 
 class PhpRedisNotInstalledException extends \Exception
diff --git a/src/Exceptions/TenantCouldNotBeIdentifiedException.php b/src/Exceptions/TenantCouldNotBeIdentifiedException.php
index 2e35eebb..1d1b9633 100644
--- a/src/Exceptions/TenantCouldNotBeIdentifiedException.php
+++ b/src/Exceptions/TenantCouldNotBeIdentifiedException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Exceptions;
 
 class TenantCouldNotBeIdentifiedException extends \Exception
diff --git a/src/GlobalCacheFacade.php b/src/GlobalCacheFacade.php
index bc4d9317..d8de4469 100644
--- a/src/GlobalCacheFacade.php
+++ b/src/GlobalCacheFacade.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Illuminate\Support\Facades\Facade;
diff --git a/src/Interfaces/StorageDriver.php b/src/Interfaces/StorageDriver.php
index 1bda4976..22fae59b 100644
--- a/src/Interfaces/StorageDriver.php
+++ b/src/Interfaces/StorageDriver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Interfaces;
 
 interface StorageDriver
diff --git a/src/Interfaces/TenantDatabaseManager.php b/src/Interfaces/TenantDatabaseManager.php
index 3abc8698..c44d78bf 100644
--- a/src/Interfaces/TenantDatabaseManager.php
+++ b/src/Interfaces/TenantDatabaseManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Interfaces;
 
 interface TenantDatabaseManager
diff --git a/src/Interfaces/UniqueIdentifierGenerator.php b/src/Interfaces/UniqueIdentifierGenerator.php
index becf19d2..5033f6d5 100644
--- a/src/Interfaces/UniqueIdentifierGenerator.php
+++ b/src/Interfaces/UniqueIdentifierGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Interfaces;
 
 interface UniqueIdentifierGenerator
diff --git a/src/Jobs/QueuedTenantDatabaseCreator.php b/src/Jobs/QueuedTenantDatabaseCreator.php
index d8eb90d1..ce8e737c 100644
--- a/src/Jobs/QueuedTenantDatabaseCreator.php
+++ b/src/Jobs/QueuedTenantDatabaseCreator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Jobs;
 
 use Illuminate\Bus\Queueable;
diff --git a/src/Jobs/QueuedTenantDatabaseDeleter.php b/src/Jobs/QueuedTenantDatabaseDeleter.php
index cf3a964e..48371f3d 100644
--- a/src/Jobs/QueuedTenantDatabaseDeleter.php
+++ b/src/Jobs/QueuedTenantDatabaseDeleter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Jobs;
 
 use Illuminate\Bus\Queueable;
diff --git a/src/Middleware/InitializeTenancy.php b/src/Middleware/InitializeTenancy.php
index 10f41819..3b488f90 100644
--- a/src/Middleware/InitializeTenancy.php
+++ b/src/Middleware/InitializeTenancy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Middleware;
 
 use Closure;
diff --git a/src/StorageDrivers/DatabaseStorageDriver.php b/src/StorageDrivers/DatabaseStorageDriver.php
index aaa443d2..4e60972f 100644
--- a/src/StorageDrivers/DatabaseStorageDriver.php
+++ b/src/StorageDrivers/DatabaseStorageDriver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\StorageDrivers;
 
 use Stancl\Tenancy\Tenant;
diff --git a/src/StorageDrivers/RedisStorageDriver.php b/src/StorageDrivers/RedisStorageDriver.php
index 74771a5f..29e9e06d 100644
--- a/src/StorageDrivers/RedisStorageDriver.php
+++ b/src/StorageDrivers/RedisStorageDriver.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\StorageDrivers;
 
 use Illuminate\Support\Facades\Redis;
diff --git a/src/TenancyFacade.php b/src/TenancyFacade.php
index a3c4acdc..d9b3bcdd 100644
--- a/src/TenancyFacade.php
+++ b/src/TenancyFacade.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Illuminate\Support\Facades\Facade;
diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index 3acd9c13..8d60d09e 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Laravel\Telescope\Telescope;
diff --git a/src/Tenant.php b/src/Tenant.php
index 0f14eaac..4c9cb04d 100644
--- a/src/Tenant.php
+++ b/src/Tenant.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Illuminate\Database\Eloquent\Model;
diff --git a/src/TenantDatabaseManagers/MySQLDatabaseManager.php b/src/TenantDatabaseManagers/MySQLDatabaseManager.php
index f0feff25..e1f79dd7 100644
--- a/src/TenantDatabaseManagers/MySQLDatabaseManager.php
+++ b/src/TenantDatabaseManagers/MySQLDatabaseManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
 use Illuminate\Support\Facades\DB;
diff --git a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php
index cfc60f4e..60a27395 100644
--- a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php
+++ b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
 use Illuminate\Support\Facades\DB;
diff --git a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php
index cdfc094b..849e5692 100644
--- a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php
+++ b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
 use Stancl\Tenancy\Interfaces\TenantDatabaseManager;
diff --git a/src/TenantManager.php b/src/TenantManager.php
index b8909e08..80c552e2 100644
--- a/src/TenantManager.php
+++ b/src/TenantManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Stancl\Tenancy\Interfaces\StorageDriver;
@@ -383,7 +385,9 @@ final class TenantManager
     protected function jsonDecodeArrayValues(array $array)
     {
         \array_walk($array, function (&$value, $key) {
-            $value = \json_decode($value, true);
+            if ($value) {
+                $value = \json_decode($value, true);
+            }
         });
 
         return $array;
diff --git a/src/TenantRouteServiceProvider.php b/src/TenantRouteServiceProvider.php
index e6551756..f6d7f60f 100644
--- a/src/TenantRouteServiceProvider.php
+++ b/src/TenantRouteServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Illuminate\Support\Facades\Route;
diff --git a/src/Traits/BootstrapsTenancy.php b/src/Traits/BootstrapsTenancy.php
index 5e45c3bc..82ca708f 100644
--- a/src/Traits/BootstrapsTenancy.php
+++ b/src/Traits/BootstrapsTenancy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Traits;
 
 use Stancl\Tenancy\CacheManager;
diff --git a/src/Traits/DealsWithMigrations.php b/src/Traits/DealsWithMigrations.php
index e0187427..48531587 100644
--- a/src/Traits/DealsWithMigrations.php
+++ b/src/Traits/DealsWithMigrations.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Traits;
 
 trait DealsWithMigrations
diff --git a/src/Traits/HasATenantsOption.php b/src/Traits/HasATenantsOption.php
index 1c37cfe1..26680d03 100644
--- a/src/Traits/HasATenantsOption.php
+++ b/src/Traits/HasATenantsOption.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Traits;
 
 use Symfony\Component\Console\Input\InputOption;
diff --git a/src/Traits/TenantManagerEvents.php b/src/Traits/TenantManagerEvents.php
index 986388cb..d10ece26 100644
--- a/src/Traits/TenantManagerEvents.php
+++ b/src/Traits/TenantManagerEvents.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Traits;
 
 use Illuminate\Support\Collection;
diff --git a/src/UUIDGenerator.php b/src/UUIDGenerator.php
index 547d0ac5..6f0fb713 100644
--- a/src/UUIDGenerator.php
+++ b/src/UUIDGenerator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy;
 
 use Stancl\Tenancy\Interfaces\UniqueIdentifierGenerator;
diff --git a/src/helpers.php b/src/helpers.php
index 29cb3411..0e6b8ad7 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Stancl\Tenancy\TenantManager;
 
 if (! \function_exists('tenancy')) {
diff --git a/src/routes.php b/src/routes.php
index 861368d1..69f51e70 100644
--- a/src/routes.php
+++ b/src/routes.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 Route::get('/tenancy/assets/{path}', 'Stancl\Tenancy\Controllers\TenantAssetsController@asset')
     ->where('path', '(.*)')
     ->name('stancl.tenancy.asset');
diff --git a/tests/BootstrapsTenancyTest.php b/tests/BootstrapsTenancyTest.php
index f20170bb..f83f4dea 100644
--- a/tests/BootstrapsTenancyTest.php
+++ b/tests/BootstrapsTenancyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\Redis;
diff --git a/tests/CacheManagerTest.php b/tests/CacheManagerTest.php
index fe884182..0f790083 100644
--- a/tests/CacheManagerTest.php
+++ b/tests/CacheManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 class CacheManagerTest extends TestCase
diff --git a/tests/CommandsTest.php b/tests/CommandsTest.php
index f1e6e4d5..34f98462 100644
--- a/tests/CommandsTest.php
+++ b/tests/CommandsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\DB;
diff --git a/tests/DataSeparationTest.php b/tests/DataSeparationTest.php
index 89790df0..0c3d6dc4 100644
--- a/tests/DataSeparationTest.php
+++ b/tests/DataSeparationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Str;
diff --git a/tests/DatabaseManagerTest.php b/tests/DatabaseManagerTest.php
index ec8b8df2..2312f3d5 100644
--- a/tests/DatabaseManagerTest.php
+++ b/tests/DatabaseManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Stancl\Tenancy\DatabaseManager;
diff --git a/tests/Etc/ConsoleKernel.php b/tests/Etc/ConsoleKernel.php
index a0d82a84..a801b9dc 100644
--- a/tests/Etc/ConsoleKernel.php
+++ b/tests/Etc/ConsoleKernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests\Etc;
 
 use Orchestra\Testbench\Console\Kernel;
diff --git a/tests/Etc/ExampleCommand.php b/tests/Etc/ExampleCommand.php
index 76932163..49e7189b 100644
--- a/tests/Etc/ExampleCommand.php
+++ b/tests/Etc/ExampleCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests\Etc;
 
 use Illuminate\Console\Command;
diff --git a/tests/Etc/ExampleSeeder.php b/tests/Etc/ExampleSeeder.php
index 591b9ac6..9d80b32a 100644
--- a/tests/Etc/ExampleSeeder.php
+++ b/tests/Etc/ExampleSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests\Etc;
 
 use Illuminate\Support\Str;
diff --git a/tests/Etc/HttpKernel.php b/tests/Etc/HttpKernel.php
index 4b21982e..3d5033b2 100644
--- a/tests/Etc/HttpKernel.php
+++ b/tests/Etc/HttpKernel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests\Etc;
 
 use Illuminate\Foundation\Http\Kernel;
diff --git a/tests/FacadeTest.php b/tests/FacadeTest.php
index 45da854c..b7a2e8f7 100644
--- a/tests/FacadeTest.php
+++ b/tests/FacadeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Tenant;
diff --git a/tests/GlobalCacheTest.php b/tests/GlobalCacheTest.php
index 8d517a17..45192c71 100644
--- a/tests/GlobalCacheTest.php
+++ b/tests/GlobalCacheTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use GlobalCache;
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index a84fe2d2..70750f03 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Bus\Queueable;
diff --git a/tests/ReidentificationTest.php b/tests/ReidentificationTest.php
index c88e6c6d..96edda8f 100644
--- a/tests/ReidentificationTest.php
+++ b/tests/ReidentificationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 class ReidentificationTest extends TestCase
diff --git a/tests/TenantAssetTest.php b/tests/TenantAssetTest.php
index b43d43c6..680cb3bb 100644
--- a/tests/TenantAssetTest.php
+++ b/tests/TenantAssetTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 class TenantAssetTest extends TestCase
diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php
index 533c6eee..149b6dca 100644
--- a/tests/TenantDatabaseManagerTest.php
+++ b/tests/TenantDatabaseManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\DB;
diff --git a/tests/TenantManagerEventsTest.php b/tests/TenantManagerEventsTest.php
index 2fcd74b1..51aec6b5 100644
--- a/tests/TenantManagerEventsTest.php
+++ b/tests/TenantManagerEventsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Tenant;
diff --git a/tests/TenantManagerTest.php b/tests/TenantManagerTest.php
index 73bcf0fe..347a8e57 100644
--- a/tests/TenantManagerTest.php
+++ b/tests/TenantManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\DB;
diff --git a/tests/TenantRedirectMacroTest.php b/tests/TenantRedirectMacroTest.php
index de44a650..34183093 100644
--- a/tests/TenantRedirectMacroTest.php
+++ b/tests/TenantRedirectMacroTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Route;
diff --git a/tests/TenantStorageTest.php b/tests/TenantStorageTest.php
index 2dd3e1b8..86230f1f 100644
--- a/tests/TenantStorageTest.php
+++ b/tests/TenantStorageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Stancl\Tenancy\Tenant;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index b4f39982..5dae9641 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Stancl\Tenancy\Tests;
 
 use Illuminate\Support\Facades\Redis;
@@ -160,7 +162,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
 
     public function randomString(int $length = 10)
     {
-        return \substr(\str_shuffle(\str_repeat($x = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', \ceil($length / \strlen($x)))), 1, $length);
+        return \substr(\str_shuffle(\str_repeat($x = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', (int) (\ceil($length / \strlen($x))))), 1, $length);
     }
 
     public function isContainerized()