diff --git a/resources/views/debug.twig b/resources/views/debug.twig
index 2e305dd429..f38c43b581 100644
--- a/resources/views/debug.twig
+++ b/resources/views/debug.twig
@@ -15,10 +15,14 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | Variable | Content |
 | --- | --- |
 | FF version | {{ FF_VERSION }} |
+| App environment | {{ appEnv }} |
+| App debug mode | {{ appDebug }} |
+| App logging | {{ appLogLevel }}, {{ appLog }} |
 | PHP version | {{ phpVersion }} |
+| Display errors | {{ displayErrors }} |
+| Error reporting | {{ errorReporting }} |
 | Host | {{ phpOs }} |
 | Interface | {{ interface }} |
-| Loaded extensions | {{ extensions }} |
 | UserID | {{ Auth.user.id }} |
 | DB drivers | {{ drivers }} |
 | Current driver | {{ currentDriver }} |
@@ -28,7 +32,8 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | Is Docker (.env) | {{ isDocker }} |
 | Trusted proxies (.env) | {{ trustedProxies }} |
 | User agent | {{ userAgent }} |
-
+| Loaded extensions | {{ extensions }} |
+| Installed packages | {% for package in packages %}{{ package.name }}@{{ package.version }}, {% endfor %} |
 </textarea>
 
 <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
diff --git a/routes/web.php b/routes/web.php
index 125308b036..cbc6293852 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -58,7 +58,7 @@ Route::group(
     Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']);
     Route::get('flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);
     Route::get('routes', ['uses' => 'HomeController@routes', 'as' => 'routes']);
-    Route::get('debug', 'HomeController@displayDebug')->name('debug');
+    Route::get('debug', 'DebugController@index')->name('debug');
 }
 );
 
diff --git a/tests/Feature/Controllers/DebugControllerTest.php b/tests/Feature/Controllers/DebugControllerTest.php
new file mode 100644
index 0000000000..19efadbcd7
--- /dev/null
+++ b/tests/Feature/Controllers/DebugControllerTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * DebugControllerTest.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+declare(strict_types=1);
+
+namespace Tests\Feature\Controllers;
+
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Support\Collection;
+use Tests\TestCase;
+
+/**
+ * Class HomeControllerTest
+ *
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DebugControllerTest extends TestCase
+{
+    /**
+     * @covers \FireflyIII\Http\Controllers\DebugController::index
+     * @covers \FireflyIII\Http\Controllers\DebugController::errorReporting
+     * @covers \FireflyIII\Http\Controllers\DebugController::collectPackages
+     */
+    public function testIndex()
+    {
+        $this->be($this->user());
+        $response = $this->get(route('debug'));
+        $response->assertStatus(200);
+    }
+
+}
diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php
index b5c38bf52a..c933215939 100644
--- a/tests/Feature/Controllers/HomeControllerTest.php
+++ b/tests/Feature/Controllers/HomeControllerTest.php
@@ -86,16 +86,6 @@ class HomeControllerTest extends TestCase
         $response->assertSessionHas('warning', '91 days of data may take a while to load.');
     }
 
-    /**
-     * @covers \FireflyIII\Http\Controllers\HomeController::displayDebug()
-     */
-    public function testDisplayDebug()
-    {
-        $this->be($this->user());
-        $response = $this->get(route('debug'));
-        $response->assertStatus(200);
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\HomeController::displayError
      */