diff --git a/src/main/java/io/github/bonigarcia/wdm/WdmServer.java b/src/main/java/io/github/bonigarcia/wdm/WdmServer.java
index 3e2e157a2..c60482e3f 100644
--- a/src/main/java/io/github/bonigarcia/wdm/WdmServer.java
+++ b/src/main/java/io/github/bonigarcia/wdm/WdmServer.java
@@ -164,6 +164,7 @@ private void seleniumServer(Context ctx) throws IOException {
                     .browserVersion(version);
             wdm.create();
             seleniumServerUrl = wdm.getDockerSeleniumServerUrl();
+            wdm.getWebDriver().quit();
         } else {
             String sessionIdFromPath = getSessionIdFromPath(requestPath);
             seleniumServerUrl = sessionMap.get(sessionIdFromPath);
@@ -197,7 +198,7 @@ private void seleniumServer(Context ctx) throws IOException {
     private String getSessionIdFromResponse(String response) {
         response = response.substring(
                 response.indexOf(SESSIONID) + SESSIONID.length() + 1);
-        response = response.substring(0, response.indexOf("\""));
+        response = response.substring(1, response.indexOf(",") - 1);
         return response;
     }
 
@@ -279,6 +280,7 @@ public String exchange(String url, String method, String json,
         String responseContent = null;
         BasicHttpClientConnectionManager connectionManager = new BasicHttpClientConnectionManager();
         connectionManager.setConnectionConfig(ConnectionConfig.custom()
+                .setSocketTimeout(timeoutSec, TimeUnit.SECONDS)
                 .setConnectTimeout(timeoutSec, TimeUnit.SECONDS).build());
 
         try (CloseableHttpClient closeableHttpClient = HttpClientBuilder
diff --git a/src/test/java/io/github/bonigarcia/wdm/test/server/ServerSeleniumTest.java b/src/test/java/io/github/bonigarcia/wdm/test/server/ServerSeleniumTest.java
index 879513f98..716348b5b 100644
--- a/src/test/java/io/github/bonigarcia/wdm/test/server/ServerSeleniumTest.java
+++ b/src/test/java/io/github/bonigarcia/wdm/test/server/ServerSeleniumTest.java
@@ -27,7 +27,6 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -51,7 +50,6 @@
  * @since 5.0.0
  */
 @EnabledOnOs(LINUX)
-@Disabled
 class ServerSeleniumTest {
 
     static final Logger log = getLogger(lookup().lookupClass());