diff --git a/pom.xml b/pom.xml
index c1feb27..212b140 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>ucles.weblab</groupId>
     <artifactId>weblab-api-tunnel</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -22,7 +22,7 @@
     </modules>
 
     <properties>
-        <common-java.version>0.4-SNAPSHOT</common-java.version>
+        <common-java.version>2.0.0-SNAPSHOT</common-java.version>
         <websocket.version>1.1</websocket.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/weblab-api-tunnel-client/pom.xml b/weblab-api-tunnel-client/pom.xml
index 28f4ba9..c967af9 100644
--- a/weblab-api-tunnel-client/pom.xml
+++ b/weblab-api-tunnel-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-api-tunnel</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.4-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/weblab-api-tunnel-client/src/test/java/ucles/weblab/common/tunnel/client/WebSocketConnectionInstigator_IT.java b/weblab-api-tunnel-client/src/test/java/ucles/weblab/common/tunnel/client/WebSocketConnectionInstigator_IT.java
index c1b6fc1..de9efdb 100644
--- a/weblab-api-tunnel-client/src/test/java/ucles/weblab/common/tunnel/client/WebSocketConnectionInstigator_IT.java
+++ b/weblab-api-tunnel-client/src/test/java/ucles/weblab/common/tunnel/client/WebSocketConnectionInstigator_IT.java
@@ -4,8 +4,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -18,17 +17,19 @@
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
 
 /**
  * @since 07/09/2016
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@IntegrationTest
-@SpringApplicationConfiguration(classes = { WebSocketConnectionInstigator_IT.Config.class, WebSocketTunnelConfiguration.class })
+@SpringBootTest(
+        classes = { WebSocketConnectionInstigator_IT.Config.class, WebSocketTunnelConfiguration.class },
+        webEnvironment = NONE)
 @TestPropertySource(locations = "classpath:test.properties")
 public class WebSocketConnectionInstigator_IT {
     @Configuration
diff --git a/weblab-api-tunnel-common/pom.xml b/weblab-api-tunnel-common/pom.xml
index 4e864cb..0584bfa 100644
--- a/weblab-api-tunnel-common/pom.xml
+++ b/weblab-api-tunnel-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-api-tunnel</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.4-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/weblab-api-tunnel-server/pom.xml b/weblab-api-tunnel-server/pom.xml
index c448591..4d206e4 100644
--- a/weblab-api-tunnel-server/pom.xml
+++ b/weblab-api-tunnel-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>weblab-api-tunnel</artifactId>
         <groupId>ucles.weblab</groupId>
-        <version>0.4-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/weblab-api-tunnel-server/src/main/java/ucles/weblab/common/tunnel/server/WebSocketHttpRequestFactory.java b/weblab-api-tunnel-server/src/main/java/ucles/weblab/common/tunnel/server/WebSocketHttpRequestFactory.java
index c8677b7..dae6d53 100644
--- a/weblab-api-tunnel-server/src/main/java/ucles/weblab/common/tunnel/server/WebSocketHttpRequestFactory.java
+++ b/weblab-api-tunnel-server/src/main/java/ucles/weblab/common/tunnel/server/WebSocketHttpRequestFactory.java
@@ -73,6 +73,16 @@ private class WebSocketHttpRequest implements ClientHttpRequest {
             this.method = method;
         }
 
+        @Override
+        public HttpMethod getMethod() {
+            return method;
+        }
+
+        @Override
+        public String getMethodValue() {
+            return method == null ? null : method.name();
+        }
+
         @JsonIgnore
         public URI getURI() {
             return url;