diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java
index acfcd4c5680..42348699e4a 100644
--- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java
+++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java
@@ -22,6 +22,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Objects;
 
 import org.apache.commons.io.FileUtils;
@@ -113,7 +114,9 @@ public void viteShouldUpgradeFromEs2019() throws Exception {
 
     @Test
     public void should_notGenerateTsConfig_TsConfigExist() throws Exception {
-        Files.createFile(new File(npmFolder, "tsconfig.json").toPath());
+        Path tsconfig = Files
+                .createFile(new File(npmFolder, "tsconfig.json").toPath());
+        Files.writeString(tsconfig, "text", UTF_8);
         taskGenerateTsConfig.execute();
         Assert.assertFalse(
                 "Should not generate tsconfig.json when tsconfig.json exists",
diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java
index 845cf7ae1c5..4163999e1af 100644
--- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java
+++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.io.FileUtils;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
@@ -49,6 +50,7 @@
 import elemental.json.Json;
 import elemental.json.JsonObject;
 
+@NotThreadSafe
 @Category(SlowTests.class)
 public class TaskRunPnpmInstallTest extends TaskRunNpmInstallTest {
 
diff --git a/pom.xml b/pom.xml
index a2a97c85a73..4499ed73595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 
         <!-- Plugins -->
         <frontend.maven.plugin.version>1.5</frontend.maven.plugin.version>
-        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>3.0.0</maven.surefire.plugin.version>
         <maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
         <maven.war.plugin.version>3.3.2</maven.war.plugin.version>
         <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>