diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 3edf5344..f57ab1ae 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -15,6 +15,8 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Illuminate\Foundation\Http\Middleware\TrimStrings::class,
         \App\Http\Middleware\DetectLanguagePrefer::class,
     ];
 
diff --git a/tests/SetupControllerTest.php b/tests/SetupControllerTest.php
index 6985ea70..a9af3882 100644
--- a/tests/SetupControllerTest.php
+++ b/tests/SetupControllerTest.php
@@ -58,7 +58,7 @@ class SetupControllerTest extends TestCase
 
     public function testReportDatabaseConnectionError()
     {
-        $this->post('/setup/database', ['type' => 'sqlite', 'host' => '', 'db' => 'test'])
+        $this->post('/setup/database', ['type' => 'sqlite', 'host' => 'placeholder', 'db' => 'test'])
             ->assertSee(trans('setup.database.connection-error', [
                 'type' => 'SQLite',
                 'msg' => 'Database (test) does not exist.'