diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
index 62378f61..b41e59e0 100644
--- a/tests/AbstractTestCase.php
+++ b/tests/AbstractTestCase.php
@@ -11,6 +11,8 @@
 
 namespace CachetHQ\Tests\Cachet;
 
+use CachetHQ\Cachet\Models\User;
+use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Testing\TestCase;
 
 abstract class AbstractTestCase extends TestCase
@@ -31,17 +33,20 @@ abstract class AbstractTestCase extends TestCase
     {
         $app = require __DIR__.'/../bootstrap/app.php';
 
-        $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
+        $app->make(Kernel::class)->bootstrap();
 
         return $app;
     }
 
     /**
-     * Becomes a user.
+     * Become a user.
+     *
+     * @return void
      */
     protected function beUser()
     {
-        $this->user = factory('CachetHQ\Cachet\Models\User')->create();
+        $this->user = factory(User::class)->create();
+
         $this->be($this->user);
     }
 }
diff --git a/tests/Functional/CommandTest.php b/tests/Functional/CommandTest.php
index e919df7f..b6a67c7f 100644
--- a/tests/Functional/CommandTest.php
+++ b/tests/Functional/CommandTest.php
@@ -12,16 +12,12 @@
 namespace CachetHQ\Tests\Cachet\Functional;
 
 use CachetHQ\Tests\Cachet\AbstractTestCase;
+use Illuminate\Contracts\Console\Kernel;
 
 class CommandTest extends AbstractTestCase
 {
     public function testMigrations()
     {
-        $this->assertSame(0, $this->getKernel()->call('migrate', ['--force' => true]));
-    }
-
-    protected function getKernel()
-    {
-        return $this->app->make('Illuminate\Contracts\Console\Kernel');
+        $this->assertSame(0, $this->app->make(Kernel::class)->call('migrate', ['--force' => true]));
     }
 }