diff --git a/composer.json b/composer.json
index 5424fda..acc5e85 100644
--- a/composer.json
+++ b/composer.json
@@ -21,20 +21,20 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "illuminate/contracts": "^5.1|^6.0|^7.0",
-        "illuminate/database": "^5.1|^6.0|^7.0",
-        "illuminate/routing": "^5.1|^6.0|^7.0",
-        "illuminate/session": "^5.1|^6.0|^7.0",
-        "illuminate/support": "^5.1|^6.0|^7.0",
-        "illuminate/view": "^5.1|^6.0|^7.0",
-        "recca0120/terminal": "^1.0",
-        "tracy/tracy": "^2.4|^2.5|^2.6|^2.7"
+        "illuminate/contracts": "^5.1|^6.0|^7.0|^8.0",
+        "illuminate/database": "^5.1|^6.0|^7.0|^8.0",
+        "illuminate/routing": "^5.1|^6.0|^7.0|^8.0",
+        "illuminate/session": "^5.1|^6.0|^7.0|^8.0",
+        "illuminate/support": "^5.1|^6.0|^7.0|^8.0",
+        "illuminate/view": "^5.1|^6.0|^7.0|^8.0",
+        "recca0120/terminal": "^1.9",
+        "tracy/tracy": "^2.4|^2.5|^2.6|^2.7|^3.0"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.4|^1.0",
         "nesbot/carbon": "^1.20|^2.0",
-        "phpunit/phpunit": "^4.8|^5.4|^6.1|^7.0|^8.0",
-        "vlucas/phpdotenv": "^4.1"
+        "phpunit/phpunit": "^4.8|^5.4|^6.1|^7.0|^8.0|^9.0",
+        "vlucas/phpdotenv": "^4.1|^5.0"
     },
     "autoload": {
         "files": [
diff --git a/tests/LaravelTracyServiceProviderTest.php b/tests/LaravelTracyServiceProviderTest.php
index 9a5806e..07f92ca 100644
--- a/tests/LaravelTracyServiceProviderTest.php
+++ b/tests/LaravelTracyServiceProviderTest.php
@@ -25,18 +25,14 @@ public function testRegister()
         $serviceProvider = new LaravelTracyServiceProvider(
             $app = m::mock('Illuminate\Contracts\Foundation\Application, ArrayAccess')
         );
-        $app->shouldReceive('offsetGet')->twice()->with('config')->andReturn(
-            $config = m::mock('Illuminate\Contracts\Config\Repository, ArrayAccess')
-        );
+        $config = m::mock('Illuminate\Contracts\Config\Repository, ArrayAccess');
+        $app->shouldReceive('make')->with('config')->andReturn($config);
+        // $app->shouldReceive('offsetGet')->with('config')->andReturn($config);
         $config->shouldReceive('get')->once()->with('tracy', [])->andReturn([]);
         $config->shouldReceive('set')->once()->with('tracy', m::type('array'));
 
         $app->shouldReceive('offsetGet')->once()->with('config')->andReturn($config = [
-            'tracy' => [
-                'panels' => [
-                    'terminal' => true,
-                ],
-            ],
+            'tracy' => ['panels' => ['terminal' => true]],
         ]);
 
         $app->shouldReceive('register')->once()->with('Recca0120\Terminal\TerminalServiceProvider');
@@ -55,6 +51,7 @@ public function testRegister()
 
             return $bar instanceof \Tracy\Bar;
         }));
+
         $app->shouldReceive('singleton')->once()->with('Recca0120\LaravelTracy\DebuggerManager', m::on(function ($closure) use ($app) {
             $app->shouldReceive('offsetGet')->once()->with('url')->andReturn(
                 $urlGenerator = m::mock('Illuminate\Contracts\Routing\UrlGenerator')