diff --git a/Radzen.Blazor.Tests/DataGridTests.cs b/Radzen.Blazor.Tests/DataGridTests.cs
index 2fb769b30..777826a36 100644
--- a/Radzen.Blazor.Tests/DataGridTests.cs
+++ b/Radzen.Blazor.Tests/DataGridTests.cs
@@ -2056,8 +2056,8 @@ namespace Radzen.Blazor.Tests
             var firstNameMenuId = $"{component.Instance.PopupID}FirstName{firstNameColumn.UniqueID}fm";
             var lastNameMenuId = $"{component.Instance.PopupID}LastName{lastNameColumn.UniqueID}fm";
 
-            Assert.Contains(menuButtons, b => b.GetAttribute("onclick")?.Contains(firstNameMenuId) == true);
-            Assert.Contains(menuButtons, b => b.GetAttribute("onclick")?.Contains(lastNameMenuId) == true);
+            Assert.Contains(menuButtons, b => b.GetAttribute("aria-controls") == firstNameMenuId);
+            Assert.Contains(menuButtons, b => b.GetAttribute("aria-controls") == lastNameMenuId);
 
             var popupIds = component.FindAll("div.rz-overlaypanel[role='menu']").Select(d => d.Id).ToList();
             Assert.Contains(firstNameMenuId, popupIds);
diff --git a/Radzen.Blazor.Tests/MaskTests.cs b/Radzen.Blazor.Tests/MaskTests.cs
index 440728f3b..77ee8a288 100644
--- a/Radzen.Blazor.Tests/MaskTests.cs
+++ b/Radzen.Blazor.Tests/MaskTests.cs
@@ -65,6 +65,7 @@ namespace Radzen.Blazor.Tests
         public void Mask_Renders_IdFromNameParameter()
         {
             using var ctx = new TestContext();
+            ctx.JSInterop.Mode = JSRuntimeMode.Loose;
 
             var component = ctx.RenderComponent<RadzenMask>();