diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionFormTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionFormTests.cs
index ae51cb45..cdfc7b6f 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionFormTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionFormTests.cs
@@ -30,7 +30,7 @@ public class DataConnectionFormTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Admin")
+            new Claim(JwtTokenService.RoleClaimType, "Admin")
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionsPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionsPageTests.cs
index bcd92993..0a5414aa 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionsPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/DataConnectionsPageTests.cs
@@ -37,7 +37,7 @@ public class DataConnectionsPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Admin")
+            new Claim(JwtTokenService.RoleClaimType, "Admin")
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/HealthPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/HealthPageTests.cs
index 350706f9..a82f116e 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/HealthPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/HealthPageTests.cs
@@ -82,7 +82,7 @@ public class HealthPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Admin"),
+            new Claim(JwtTokenService.RoleClaimType, "Admin"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationKpisPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationKpisPageTests.cs
index 9f972062..780aedf8 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationKpisPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationKpisPageTests.cs
@@ -69,7 +69,7 @@ public class NotificationKpisPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Deployment"),
+            new Claim(JwtTokenService.RoleClaimType, "Deployment"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationListsPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationListsPageTests.cs
index e1750c03..b542a350 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationListsPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationListsPageTests.cs
@@ -23,7 +23,7 @@ public class NotificationListsPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Design"),
+            new Claim(JwtTokenService.RoleClaimType, "Design"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs
index 0504d202..b8038477 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportDetailModalTests.cs
@@ -89,7 +89,7 @@ public class NotificationReportDetailModalTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Deployment"),
+            new Claim(JwtTokenService.RoleClaimType, "Deployment"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportPageTests.cs
index 2da4c880..c6408bca 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/NotificationReportPageTests.cs
@@ -74,7 +74,7 @@ public class NotificationReportPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Deployment"),
+            new Claim(JwtTokenService.RoleClaimType, "Deployment"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/QueryStringDrillInTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/QueryStringDrillInTests.cs
index 610333eb..ed8e7a3a 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/QueryStringDrillInTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/QueryStringDrillInTests.cs
@@ -173,7 +173,7 @@ public sealed class QueryStringDrillInTests
             var claims = new[]
             {
                 new Claim(JwtTokenService.UsernameClaimType, "tester"),
-                new Claim(ClaimTypes.Role, "Deployment"),
+                new Claim(JwtTokenService.RoleClaimType, "Deployment"),
             };
             var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
             Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
index 298db8ea..4ed2cc65 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
@@ -89,7 +89,7 @@ public class SiteCallsReportPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Deployment"),
+            new Claim(JwtTokenService.RoleClaimType, "Deployment"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
@@ -494,7 +494,7 @@ public class SiteCallsReportPageTests : BunitContext
         var scopedUser = new ClaimsPrincipal(new ClaimsIdentity(new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "scoped"),
-            new Claim(ClaimTypes.Role, "Deployment"),
+            new Claim(JwtTokenService.RoleClaimType, "Deployment"),
             new Claim(JwtTokenService.SiteIdClaimType, "1"), // Plant A only
         }, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(scopedUser));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SmtpConfigurationPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SmtpConfigurationPageTests.cs
index 2dc950f7..26a5d9e9 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SmtpConfigurationPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SmtpConfigurationPageTests.cs
@@ -21,7 +21,7 @@ public class SmtpConfigurationPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Admin"),
+            new Claim(JwtTokenService.RoleClaimType, "Admin"),
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TemplatesPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TemplatesPageTests.cs
index cea64831..3e6cd23b 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TemplatesPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TemplatesPageTests.cs
@@ -52,7 +52,7 @@ public class TemplatesPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Design")
+            new Claim(JwtTokenService.RoleClaimType, "Design")
         };
         var identity = new ClaimsIdentity(claims, "TestAuth");
         var user = new ClaimsPrincipal(identity);
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TopologyPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TopologyPageTests.cs
index 6d4ba969..ff8577cb 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TopologyPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/TopologyPageTests.cs
@@ -88,7 +88,7 @@ public class TopologyPageTests : BunitContext
         var claims = new[]
         {
             new Claim(JwtTokenService.UsernameClaimType, "tester"),
-            new Claim(ClaimTypes.Role, "Deployment")
+            new Claim(JwtTokenService.RoleClaimType, "Deployment")
         };
         var user = new ClaimsPrincipal(new ClaimsIdentity(claims, "TestAuth"));
         Services.AddSingleton<AuthenticationStateProvider>(new TestAuthStateProvider(user));