diff --git a/src/Guards/TokenGuard.php b/src/Guards/TokenGuard.php
index 640c6961e..a10a1fed5 100644
--- a/src/Guards/TokenGuard.php
+++ b/src/Guards/TokenGuard.php
@@ -13,6 +13,7 @@
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Http\Request;
 use Illuminate\Support\Traits\Macroable;
+use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Passport;
 use Laravel\Passport\PassportUserProvider;
@@ -353,4 +354,17 @@ public static function serialized()
     {
         return EncryptCookies::serialized('XSRF-TOKEN');
     }
+
+    /**
+     * Set the client for the current request.
+     *
+     * @param  \Laravel\Passport\Client  $client
+     * @return $this
+     */
+    public function setClient(Client $client)
+    {
+        $this->client = $client;
+
+        return $this;
+    }
 }
diff --git a/src/Passport.php b/src/Passport.php
index c12618571..38c6c8542 100644
--- a/src/Passport.php
+++ b/src/Passport.php
@@ -381,9 +381,10 @@ public static function actingAs($user, $scopes = [], $guard = 'api')
      *
      * @param  \Laravel\Passport\Client  $client
      * @param  array  $scopes
+     * @param  string  $guard
      * @return \Laravel\Passport\Client
      */
-    public static function actingAsClient($client, $scopes = [])
+    public static function actingAsClient($client, $scopes = [], $guard = 'api')
     {
         $token = app(self::tokenModel());
 
@@ -407,6 +408,10 @@ public static function actingAsClient($client, $scopes = [])
 
         app()->instance(TokenRepository::class, $mock);
 
+        app('auth')->guard($guard)->setClient($client);
+
+        app('auth')->shouldUse($guard);
+
         return $client;
     }
 
diff --git a/tests/Feature/ActingAsClientTest.php b/tests/Feature/ActingAsClientTest.php
index 8fc99b777..f0a92c7d7 100644
--- a/tests/Feature/ActingAsClientTest.php
+++ b/tests/Feature/ActingAsClientTest.php
@@ -7,9 +7,8 @@
 use Laravel\Passport\Http\Middleware\CheckClientCredentials;
 use Laravel\Passport\Http\Middleware\CheckClientCredentialsForAnyScope;
 use Laravel\Passport\Passport;
-use Orchestra\Testbench\TestCase;
 
-class ActingAsClientTest extends TestCase
+class ActingAsClientTest extends PassportTestCase
 {
     public function testActingAsClientWhenTheRouteIsProtectedByCheckClientCredentialsMiddleware()
     {
@@ -46,4 +45,11 @@ public function testActingAsClientWhenTheRouteIsProtectedByCheckClientCredential
         $response->assertSuccessful();
         $response->assertSee('bar');
     }
+
+    public function testActingAsClientSetsTheClientOnTheGuard()
+    {
+        Passport::actingAsClient($client = new Client());
+
+        $this->assertSame($client, app('auth')->client());
+    }
 }