diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml
index 56378260..1324a725 100644
--- a/openvidu-test-e2e/pom.xml
+++ b/openvidu-test-e2e/pom.xml
@@ -79,6 +79,12 @@
 			<version>${selenium-jupiter.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.github.bonigarcia</groupId>
+			<artifactId>webdrivermanager</artifactId>
+			<version>1.7.2</version>
+			<scope>test</scope>
+		</dependency>
 
 
 		<dependency>
@@ -135,6 +141,7 @@
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit.jupiter.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
index 912ba4a7..0dd90621 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
@@ -39,6 +39,8 @@ import org.openqa.selenium.WebElement;
 import org.slf4j.Logger;
 
 import io.github.bonigarcia.SeleniumExtension;
+import io.github.bonigarcia.wdm.ChromeDriverManager;
+import io.github.bonigarcia.wdm.FirefoxDriverManager;
 import io.openvidu.java.client.OpenVidu;
 import io.openvidu.java.client.Session;
 import io.openvidu.test.e2e.browser.BrowserUser;
@@ -69,6 +71,9 @@ public class OpenViduTestAppE2eTest {
 
 	@BeforeAll()
 	static void setupAll() {
+		ChromeDriverManager.getInstance().setup();
+		FirefoxDriverManager.getInstance().setup();
+		
 		String appUrl = getProperty("app.url");
 		if (appUrl != null) {
 			APP_URL = appUrl;
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/ChromeUser.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/ChromeUser.java
index 7bf27f8c..7e6bbcb2 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/ChromeUser.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/ChromeUser.java
@@ -28,8 +28,6 @@ public class ChromeUser extends BrowserUser {
 	public ChromeUser(String userName, int timeOfWaitInSeconds) {
 		super(userName, timeOfWaitInSeconds);
 
-		System.setProperty("webdriver.chrome.driver", "/home/chromedriver");
-
 		ChromeOptions options = new ChromeOptions();
 		// This flag avoids to grant the user media
 		options.addArguments("--use-fake-ui-for-media-stream");
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/FirefoxUser.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/FirefoxUser.java
index 1cb1f8c6..21a08802 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/FirefoxUser.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/browser/FirefoxUser.java
@@ -26,8 +26,6 @@ public class FirefoxUser extends BrowserUser {
 	public FirefoxUser(String userName, int timeOfWaitInSeconds) {
 		super(userName, timeOfWaitInSeconds);
 		
-		System.setProperty("webdriver.gecko.driver", "/home/geckodriver");
-
 		DesiredCapabilities capabilities = new DesiredCapabilities();
 		capabilities.setCapability("acceptInsecureCerts", true);
 		FirefoxProfile profile = new FirefoxProfile();