diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
index 8286c72f5a8..ff988ed1e8c 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/PerMessageDeflateExtensionTest.java
@@ -150,7 +150,7 @@ public class PerMessageDeflateExtensionTest
             Future<Session> fut = client.connect(clientSocket,server.getServerUri(),request);
 
             // Wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(30,TimeUnit.SECONDS);
 
             assertThat("Response.extensions",getNegotiatedExtensionList(session),containsString("permessage-deflate"));
 
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
index 9e42b063bcb..cd014d76308 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketOverSSLTest.java
@@ -43,6 +43,8 @@ import org.junit.Test;
 
 public class WebSocketOverSSLTest
 {
+    public static final int CONNECT_TIMEOUT = 15000;
+    public static final int FUTURE_TIMEOUT_SEC = 30;
     @Rule
     public TestTracker tracker = new TestTracker();
     
@@ -84,7 +86,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(3,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             String msg = "this is an echo ... cho ... ho ... o";
@@ -118,7 +120,7 @@ public class WebSocketOverSSLTest
         WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
         try
         {
-            client.setConnectTimeout(3000);
+            client.setConnectTimeout(CONNECT_TIMEOUT);
             client.start();
 
             CaptureSocket clientSocket = new CaptureSocket();
@@ -127,7 +129,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             RemoteEndpoint remote = session.getRemote();
@@ -160,7 +162,7 @@ public class WebSocketOverSSLTest
         WebSocketClient client = new WebSocketClient(server.getSslContextFactory(),null,bufferPool);
         try
         {
-            client.setConnectTimeout(3000);
+            client.setConnectTimeout(CONNECT_TIMEOUT);
             client.start();
 
             CaptureSocket clientSocket = new CaptureSocket();
@@ -169,7 +171,7 @@ public class WebSocketOverSSLTest
             Future<Session> fut = client.connect(clientSocket,requestUri);
 
             // wait for connect
-            Session session = fut.get(5,TimeUnit.SECONDS);
+            Session session = fut.get(FUTURE_TIMEOUT_SEC,TimeUnit.SECONDS);
 
             // Generate text frame
             RemoteEndpoint remote = session.getRemote();
diff --git a/pom.xml b/pom.xml
index 927810f6a05..94a5de3d385 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,7 +368,7 @@
         <plugin>
           <groupId>org.eclipse.jetty.toolchain</groupId>
           <artifactId>jetty-version-maven-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1147,6 +1147,7 @@
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>update-version-text</goal>
+                  <goal>tag</goal>
                 </goals>
                 <configuration>
                   <refreshTags>true</refreshTags>