diff --git a/vertx-vaadin-tests/test-common/src/main/java/com/vaadin/flow/uitest/vertx/RouterTestServlet.java b/vertx-vaadin-tests/test-common/src/main/java/com/vaadin/flow/uitest/vertx/RouterTestServlet.java
index 027d7f5e..5f68015f 100644
--- a/vertx-vaadin-tests/test-common/src/main/java/com/vaadin/flow/uitest/vertx/RouterTestServlet.java
+++ b/vertx-vaadin-tests/test-common/src/main/java/com/vaadin/flow/uitest/vertx/RouterTestServlet.java
@@ -39,6 +39,8 @@
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouteAlias;
 import com.vaadin.flow.router.RouterLayout;
+import com.vaadin.flow.server.DefaultSystemMessagesProvider;
+import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.VaadinServlet;
 import com.vaadin.flow.server.VaadinSession;
 import com.vaadin.flow.server.WrappedSession;
@@ -157,6 +159,8 @@ public static Stream<Class<? extends Component>> getViewClasses() {
     public abstract static class MyAbstractView extends Div {
 
         protected MyAbstractView() {
+            // Ensure session expired notification is not shown
+            VaadinService.getCurrent().setSystemMessagesProvider(DefaultSystemMessagesProvider.get());
             getViewClasses().forEach(c -> {
                 String viewName = c.getSimpleName();
                 Element div = ElementFactory.createDiv();
diff --git a/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/InternalErrorIT.java b/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/InternalErrorIT.java
index ea0e6d85..265384ee 100644
--- a/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/InternalErrorIT.java
+++ b/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/InternalErrorIT.java
@@ -23,6 +23,8 @@
 package com.vaadin.flow.uitest.ui;
 
 import com.vaadin.flow.testutil.ChromeBrowserTest;
+
+import net.jcip.annotations.NotThreadSafe;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -42,6 +44,7 @@
  * @author Vaadin Ltd
  * @since 1.0.
  */
+@NotThreadSafe
 public class InternalErrorIT extends ChromeBrowserTest {
 
     private static final String UPDATE = "update";
diff --git a/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/RouterSessionExpirationIT.java b/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/RouterSessionExpirationIT.java
index dd2993d0..785b2720 100644
--- a/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/RouterSessionExpirationIT.java
+++ b/vertx-vaadin-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/RouterSessionExpirationIT.java
@@ -23,11 +23,14 @@
 package com.vaadin.flow.uitest.ui;
 
 import com.vaadin.flow.testutil.ChromeBrowserTest;
+
+import net.jcip.annotations.NotThreadSafe;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.By;
 
+@NotThreadSafe
 public class RouterSessionExpirationIT extends ChromeBrowserTest {
 
     @Override
@@ -49,7 +52,6 @@ public void should_HaveANewSessionId_when_NavigationAfterSessionExpired() {
         // be a new session
         String currentSessionId = sessionId;
         waitUntil(d -> !currentSessionId.equals(getSessionId()));
-        //Assert.assertNotEquals(sessionId, getSessionId());
         sessionId = getSessionId();
         navigateToAnotherView();
         // session is preserved