diff --git a/tests/Concerns/FakeExceptionHandler.php b/tests/Concerns/FakeExceptionHandler.php
new file mode 100644
index 00000000..8967148c
--- /dev/null
+++ b/tests/Concerns/FakeExceptionHandler.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @see TestCase::disableExceptionHandling
+ */
+class FakeExceptionHandler extends App\Exceptions\Handler
+{
+    public function __construct() {
+        //
+    }
+
+    public function report(Exception $e) {
+        //
+    }
+
+    public function render($request, Exception $e)
+    {
+        // Just re-throw the exception
+        throw $e;
+    }
+}
diff --git a/tests/MarketControllerTest.php b/tests/MarketControllerTest.php
index 471f9d5f..4ec546b3 100644
--- a/tests/MarketControllerTest.php
+++ b/tests/MarketControllerTest.php
@@ -47,13 +47,12 @@ class MarketControllerTest extends TestCase
                     'description',
                     'author',
                     'dist',
-                    'enabled',
                     'dependencies'
                 ]]
             ]);
 
         // Get plugins info without an valid certificate
         config(['secure.certificates' => '']);
-        $this->setExpectedException('Error')->post('/admin/plugins/market-data');
+        $this->expectException(Exception::class)->post('/admin/plugins/market-data');
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 96c8b882..51838667 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -45,6 +45,33 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
         return $this->withSession(['uid' => $role->uid, 'token' => $role->getToken()]);
     }
 
+    /**
+     * Disable Laravel's exception handling.
+     *
+     * @see https://laracasts.com/discuss/channels/testing/testing-that-exception-was-thrown
+     * @return $this
+     */
+    protected function disableExceptionHandling()
+    {
+        $this->app->instance(App\Exceptions\Handler::class, new FakeExceptionHandler);
+
+        return $this;
+    }
+
+    /**
+     * Set an expected exception.
+     *
+     * @param string $class
+     * @return $this
+     */
+    protected function expectException($class)
+    {
+        $this->disableExceptionHandling();
+        $this->setExpectedException($class);
+
+        return $this;
+    }
+
     protected function tearDown()
     {
         $this->beforeApplicationDestroyed(function () {