diff --git a/plugins/database/mssql/mssql.go b/plugins/database/mssql/mssql.go
index 833202b8d4..488d7f3922 100644
--- a/plugins/database/mssql/mssql.go
+++ b/plugins/database/mssql/mssql.go
@@ -285,7 +285,7 @@ func (m *MSSQL) revokeUserDefault(ctx context.Context, username string) error {
 
 	rows, err := stmt.QueryContext(ctx, username)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to query users: %w", err)
 	}
 	defer rows.Close()
 
diff --git a/plugins/database/mssql/mssql_test.go b/plugins/database/mssql/mssql_test.go
index 6e866fea95..d549d52cd1 100644
--- a/plugins/database/mssql/mssql_test.go
+++ b/plugins/database/mssql/mssql_test.go
@@ -294,7 +294,7 @@ func TestUpdateUser_password(t *testing.T) {
 				Username: dbUser,
 			}
 
-			ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
+			ctx, cancel = context.WithTimeout(context.Background(), 20*time.Second)
 			defer cancel()
 			deleteResp, err := db.DeleteUser(ctx, deleteReq)
 			if err != nil {
@@ -342,7 +342,7 @@ func TestDeleteUser(t *testing.T) {
 		Username: dbUser,
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
 	deleteResp, err := db.DeleteUser(ctx, deleteReq)
 	if err != nil {