diff --git a/composer.json b/composer.json
index c5fc88c63..c5822ee45 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,7 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
+        "orchestra/testbench": "^4.4|^5.0",
         "phpunit/phpunit": "^8.0"
     },
     "autoload": {
diff --git a/src/Passport.php b/src/Passport.php
index 103ff3957..992f4333b 100644
--- a/src/Passport.php
+++ b/src/Passport.php
@@ -8,6 +8,7 @@
 use Illuminate\Support\Facades\Route;
 use League\OAuth2\Server\ResourceServer;
 use Mockery;
+use Psr\Http\Message\ServerRequestInterface;
 
 class Passport
 {
@@ -429,7 +430,7 @@ public static function actingAsClient($client, $scopes = [])
 
         $mock = Mockery::mock(ResourceServer::class);
         $mock->shouldReceive('validateAuthenticatedRequest')
-            ->andReturnUsing(function ($request) use ($token) {
+            ->andReturnUsing(function (ServerRequestInterface $request) use ($token) {
                 return $request->withAttribute('oauth_client_id', $token->client->id)
                     ->withAttribute('oauth_access_token_id', $token->id)
                     ->withAttribute('oauth_scopes', $token->scopes);
diff --git a/tests/Feature/ActingAsClientTest.php b/tests/Feature/ActingAsClientTest.php
new file mode 100644
index 000000000..8fc99b777
--- /dev/null
+++ b/tests/Feature/ActingAsClientTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Laravel\Passport\Tests\Feature;
+
+use Illuminate\Contracts\Routing\Registrar;
+use Laravel\Passport\Client;
+use Laravel\Passport\Http\Middleware\CheckClientCredentials;
+use Laravel\Passport\Http\Middleware\CheckClientCredentialsForAnyScope;
+use Laravel\Passport\Passport;
+use Orchestra\Testbench\TestCase;
+
+class ActingAsClientTest extends TestCase
+{
+    public function testActingAsClientWhenTheRouteIsProtectedByCheckClientCredentialsMiddleware()
+    {
+        $this->withoutExceptionHandling();
+
+        /** @var Registrar $router */
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('/foo', function () {
+            return 'bar';
+        })->middleware(CheckClientCredentials::class);
+
+        Passport::actingAsClient(new Client());
+
+        $response = $this->get('/foo');
+        $response->assertSuccessful();
+        $response->assertSee('bar');
+    }
+
+    public function testActingAsClientWhenTheRouteIsProtectedByCheckClientCredentialsForAnyScope()
+    {
+        $this->withoutExceptionHandling();
+
+        /** @var Registrar $router */
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('/foo', function () {
+            return 'bar';
+        })->middleware(CheckClientCredentialsForAnyScope::class.':testFoo');
+
+        Passport::actingAsClient(new Client(), ['testFoo']);
+
+        $response = $this->get('/foo');
+        $response->assertSuccessful();
+        $response->assertSee('bar');
+    }
+}
diff --git a/tests/Feature/ActingAsTest.php b/tests/Feature/ActingAsTest.php
new file mode 100644
index 000000000..aa1b3ecea
--- /dev/null
+++ b/tests/Feature/ActingAsTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Laravel\Passport\Tests\Feature;
+
+use Illuminate\Contracts\Routing\Registrar;
+use Illuminate\Foundation\Auth\User;
+use Laravel\Passport\HasApiTokens;
+use Laravel\Passport\Http\Middleware\CheckForAnyScope;
+use Laravel\Passport\Http\Middleware\CheckScopes;
+use Laravel\Passport\Passport;
+
+class ActingAsTest extends PassportTestCase
+{
+    public function testActingAsWhenTheRouteIsProtectedByAuthMiddleware()
+    {
+        $this->withoutExceptionHandling();
+
+        /** @var Registrar $router */
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('/foo', function () {
+            return 'bar';
+        })->middleware('auth:api');
+
+        Passport::actingAs(new PassportUser());
+
+        $response = $this->get('/foo');
+        $response->assertSuccessful();
+        $response->assertSee('bar');
+    }
+
+    public function testActingAsWhenTheRouteIsProtectedByCheckScopesMiddleware()
+    {
+        $this->withoutExceptionHandling();
+
+        /** @var Registrar $router */
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('/foo', function () {
+            return 'bar';
+        })->middleware(CheckScopes::class.':admin,footest');
+
+        Passport::actingAs(new PassportUser(), ['admin', 'footest']);
+
+        $response = $this->get('/foo');
+        $response->assertSuccessful();
+        $response->assertSee('bar');
+    }
+
+    public function testActingAsWhenTheRouteIsProtectedByCheckForAnyScopeMiddleware()
+    {
+        $this->withoutExceptionHandling();
+
+        /** @var Registrar $router */
+        $router = $this->app->make(Registrar::class);
+
+        $router->get('/foo', function () {
+            return 'bar';
+        })->middleware(CheckForAnyScope::class.':admin,footest');
+
+        Passport::actingAs(new PassportUser(), ['footest']);
+
+        $response = $this->get('/foo');
+        $response->assertSuccessful();
+        $response->assertSee('bar');
+    }
+}
+
+class PassportUser extends User
+{
+    use HasApiTokens;
+
+    protected $table = 'users';
+}
diff --git a/tests/Feature/PassportTestCase.php b/tests/Feature/PassportTestCase.php
new file mode 100644
index 000000000..cee7f1685
--- /dev/null
+++ b/tests/Feature/PassportTestCase.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Laravel\Passport\Tests\Feature;
+
+use Illuminate\Contracts\Config\Repository;
+use Laravel\Passport\PassportServiceProvider;
+use Orchestra\Testbench\TestCase;
+
+abstract class PassportTestCase extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->artisan('passport:keys');
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app->make(Repository::class)->set('auth.guards.api', ['driver' => 'passport', 'provider' => 'users']);
+    }
+
+    protected function getPackageProviders($app)
+    {
+        return [PassportServiceProvider::class];
+    }
+}
diff --git a/tests/KeysCommandTest.php b/tests/KeysCommandTest.php
index 8199f6b4a..a738a92e4 100644
--- a/tests/KeysCommandTest.php
+++ b/tests/KeysCommandTest.php
@@ -2,6 +2,7 @@
 
 namespace Laravel\Passport\Tests;
 
+use Illuminate\Container\Container;
 use Laravel\Passport\Console\KeysCommand;
 use Laravel\Passport\Passport;
 use Mockery as m;
@@ -13,6 +14,11 @@ function custom_path($file = null)
     return __DIR__.DIRECTORY_SEPARATOR.'files'.DIRECTORY_SEPARATOR.$file;
 }
 
+function storage_path($file = null)
+{
+    return __DIR__.DIRECTORY_SEPARATOR.$file;
+}
+
 class KeysCommandTest extends TestCase
 {
     protected function tearDown(): void
@@ -33,6 +39,8 @@ public function testPrivateAndPublicKeysAreGenerated()
             ->with('Encryption keys generated successfully.')
             ->getMock();
 
+        Container::getInstance()->instance('path.storage', storage_path());
+
         $rsa = new RSA();
 
         $command->handle($rsa);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 9914b328d..991ea4397 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,8 +1,3 @@
 <?php
 
 require __DIR__.'/../vendor/autoload.php';
-
-function storage_path($file = null)
-{
-    return __DIR__.DIRECTORY_SEPARATOR.$file;
-}