diff --git a/tenant/resolver.go b/tenant/resolver.go
index 72517b082..607a290e5 100644
--- a/tenant/resolver.go
+++ b/tenant/resolver.go
@@ -22,7 +22,7 @@ func WithDefaultResolver(r Resolver) {
 // supplied or user.ErrTooManyOrgIDs if there are multiple tenant IDs present.
 //
 // ignore stutter warning
-//nolint:golint
+//nolint:revive
 func TenantID(ctx context.Context) (string, error) {
 	return defaultResolver.TenantID(ctx)
 }
@@ -32,7 +32,7 @@ func TenantID(ctx context.Context) (string, error) {
 // NormalizeTenantIDs).
 //
 // ignore stutter warning
-//nolint:golint
+//nolint:revive
 func TenantIDs(ctx context.Context) ([]string, error) {
 	return defaultResolver.TenantIDs(ctx)
 }
diff --git a/tenant/tenant.go b/tenant/tenant.go
index fa8089890..99c1cc4a7 100644
--- a/tenant/tenant.go
+++ b/tenant/tenant.go
@@ -99,7 +99,7 @@ func isSupported(c rune) bool {
 // TenantIDsFromOrgID extracts different tenants from an orgID string value
 //
 // ignore stutter warning
-//nolint:golint
+//nolint:revive
 func TenantIDsFromOrgID(orgID string) ([]string, error) {
 	return TenantIDs(user.InjectOrgID(context.TODO(), orgID))
 }