diff --git a/build.gradle b/build.gradle
index 5c7b4f6d469..11a42897be2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -596,11 +596,11 @@ project("spring-websocket") {
 			exclude group: "javax.servlet", module: "javax.servlet"
 		}
 		optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
-		optional("io.undertow:undertow-core:1.0.0.Beta31")
-		optional("io.undertow:undertow-servlet:1.0.0.Beta31") {
+		optional("io.undertow:undertow-core:1.0.0.Final")
+		optional("io.undertow:undertow-servlet:1.0.0.Final") {
 			exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_3.1_spec"
 		}
-		optional("io.undertow:undertow-websockets-jsr:1.0.0.Beta31") {
+		optional("io.undertow:undertow-websockets-jsr:1.0.0.Final") {
 			exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.0_spec"
 		}
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
index ad597bf6060..0980cbc76ae 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
@@ -71,7 +71,7 @@ public class UndertowTestServer implements WebSocketTestServer {
 
 		try {
 			this.server = Undertow.builder()
-					.addListener(this.port, "localhost")
+					.addHttpListener(this.port, "localhost")
 					.setHandler(this.manager.start()).build();
 		}
 		catch (ServletException ex) {