diff --git a/tests/Feature/Auth/RequestPasswordTest.php b/tests/Feature/Auth/RequestPasswordTest.php
index 3ceba82160..46cf11d426 100644
--- a/tests/Feature/Auth/RequestPasswordTest.php
+++ b/tests/Feature/Auth/RequestPasswordTest.php
@@ -29,7 +29,7 @@ class RequestPasswordTest extends TestCase
     }
 
     /** @test */
-    public function can_request_password_reset_with_web_guard()
+    public function can_request_password_reset_with_custom_user_model()
     {
         Config::set('filament.auth.guard', 'web');
         Config::set('auth.providers.users.model', User::class);
diff --git a/tests/Feature/Auth/ResetPasswordTest.php b/tests/Feature/Auth/ResetPasswordTest.php
index aed9b76a46..d07af07e8d 100644
--- a/tests/Feature/Auth/ResetPasswordTest.php
+++ b/tests/Feature/Auth/ResetPasswordTest.php
@@ -30,7 +30,7 @@ class ResetPasswordTest extends TestCase
             ->assertHasNoErrors()
             ->assertRedirect(route('filament.dashboard'));
 
-        $this->assertAuthenticatedAs($user);
+        $this->assertAuthenticatedAs($user, config('filament.auth.guard'));
 
         $this->assertTrue(Filament::auth()->attempt([
             'email' => $user->email,
@@ -39,33 +39,12 @@ class ResetPasswordTest extends TestCase
     }
 
     /** @test */
-    public function can_reset_password_with_web_guard()
+    public function can_reset_password_with_custom_user_model()
     {
-        // Configure filament to use default Laravel's auth guard
         Config::set('filament.auth.guard', 'web');
-
-        // Set Laravel's default user model to filament's one, so it has filament's attributes
         Config::set('auth.providers.users.model', User::class);
 
-        $user = User::factory()->create();
-        $newPassword = Str::random();
-
-        Livewire::test(ResetPassword::class, [
-            'token' => $this->generateToken($user)
-        ])
-            ->set('email', $user->email)
-            ->set('password', $newPassword)
-            ->set('passwordConfirmation', $newPassword)
-            ->call('submit')
-            ->assertHasNoErrors()
-            ->assertRedirect(route('filament.dashboard'));
-
-        $this->assertAuthenticatedAs($user, config('filament.auth.guard'));
-
-        $this->assertTrue(Filament::auth()->attempt([
-            'email' => $user->email,
-            'password' => $newPassword,
-        ]));
+        $this->can_reset_password();
     }
 
     /** @test */