diff --git a/management/server/http/handlers/instance/instance_handler_test.go b/management/server/http/handlers/instance/instance_handler_test.go
index fd9bb0841..191fe28e6 100644
--- a/management/server/http/handlers/instance/instance_handler_test.go
+++ b/management/server/http/handlers/instance/instance_handler_test.go
@@ -10,7 +10,6 @@ import (
 	"net/mail"
 	"testing"
 
-	"github.com/golang/mock/gomock"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -19,7 +18,6 @@ import (
 	"github.com/netbirdio/netbird/management/server/idp"
 	nbinstance "github.com/netbirdio/netbird/management/server/instance"
 	"github.com/netbirdio/netbird/management/server/mock_server"
-	nbstore "github.com/netbirdio/netbird/management/server/store"
 	"github.com/netbirdio/netbird/management/server/types"
 	"github.com/netbirdio/netbird/shared/auth"
 	"github.com/netbirdio/netbird/shared/management/http/api"
@@ -461,10 +459,6 @@ func TestSetup_PAT_Success(t *testing.T) {
 func TestSetup_PAT_AccountCreationFails_Rollback(t *testing.T) {
 	t.Setenv(nbinstance.SetupPATEnabledEnvKey, "true")
 
-	ctrl := gomock.NewController(t)
-	accountStore := nbstore.NewMockStore(ctrl)
-	accountStore.EXPECT().GetAccountIDByUserID(gomock.Any(), nbstore.LockingStrengthNone, "owner-id").Return("", status.Errorf(status.NotFound, "account not found"))
-
 	rolledBackFor := ""
 	manager := &mockInstanceManager{
 		isSetupRequired: true,
@@ -480,9 +474,6 @@ func TestSetup_PAT_AccountCreationFails_Rollback(t *testing.T) {
 		GetAccountIDByUserIdFunc: func(_ context.Context, _ auth.UserAuth) (string, error) {
 			return "", errors.New("db down")
 		},
-		GetStoreFunc: func() nbstore.Store {
-			return accountStore
-		},
 	}
 
 	router := setupTestRouterWithPAT(manager, accountMgr)
@@ -501,12 +492,6 @@ func TestSetup_PAT_AccountCreationFails_Rollback(t *testing.T) {
 func TestSetup_PAT_CreatePATFails_Rollback(t *testing.T) {
 	t.Setenv(nbinstance.SetupPATEnabledEnvKey, "true")
 
-	ctrl := gomock.NewController(t)
-	accountStore := nbstore.NewMockStore(ctrl)
-	account := &types.Account{Id: "acc-1"}
-	accountStore.EXPECT().GetAccount(gomock.Any(), "acc-1").Return(account, nil)
-	accountStore.EXPECT().DeleteAccount(gomock.Any(), account).Return(nil)
-
 	rolledBackFor := ""
 	manager := &mockInstanceManager{
 		isSetupRequired: true,
@@ -525,9 +510,6 @@ func TestSetup_PAT_CreatePATFails_Rollback(t *testing.T) {
 		CreatePATFunc: func(_ context.Context, _, _, _, _ string, _ int) (*types.PersonalAccessTokenGenerated, error) {
 			return nil, status.Errorf(status.Internal, "token store unavailable")
 		},
-		GetStoreFunc: func() nbstore.Store {
-			return accountStore
-		},
 	}
 
 	router := setupTestRouterWithPAT(manager, accountMgr)