diff --git a/akka-http-core/src/test/java/akka/http/javadsl/WSEchoTestClientApp.java b/akka-http-core/src/test/java/akka/http/javadsl/WSEchoTestClientApp.java
index c19c335aa2..7c38c4f16b 100644
--- a/akka-http-core/src/test/java/akka/http/javadsl/WSEchoTestClientApp.java
+++ b/akka-http-core/src/test/java/akka/http/javadsl/WSEchoTestClientApp.java
@@ -69,7 +69,7 @@ public static void main(String[] args) throws Exception {
 
             CompletionStage<List<String>> result =
                 Http.get(system).singleWebSocketRequest(
-                    WebSocketRequest.create("ws://echo.websocket.org"),
+                    WebSocketRequest.create("ws://ws.ifelse.io"),
                     echoClient,
                     materializer
                 ).second();
diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala
index e69e385b78..6978950776 100644
--- a/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala
+++ b/akka-http-core/src/test/scala/akka/http/impl/engine/ws/EchoTestClientApp.scala
@@ -18,7 +18,7 @@ import scala.concurrent.Future
 import scala.util.{ Failure, Success }
 
 /**
- * An example App that runs a quick test against the websocket server at wss://echo.websocket.org
+ * An example App that runs a quick test against the websocket server at wss://ws.ifelse.io
  */
 object EchoTestClientApp extends App {
   implicit val system: ActorSystem = ActorSystem()
@@ -52,7 +52,7 @@ object EchoTestClientApp extends App {
 
   def echoClient = Flow.fromSinkAndSourceMat(sink, source)(Keep.left)
 
-  val (upgrade, res) = Http().singleWebSocketRequest("wss://echo.websocket.org", echoClient)
+  val (upgrade, res) = Http().singleWebSocketRequest("wss://ws.ifelse.io", echoClient)
   res onComplete {
     case Success(res) =>
       println("Run successful. Got these elements:")
diff --git a/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java b/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
index 43aa2df1ee..efa0e5add0 100644
--- a/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
@@ -59,7 +59,7 @@ public void testSingleWebSocketRequest() {
 
     final Pair<CompletionStage<WebSocketUpgradeResponse>, CompletionStage<Done>> pair =
       http.singleWebSocketRequest(
-        WebSocketRequest.create("ws://echo.websocket.org"),
+        WebSocketRequest.create("ws://ws.ifelse.io"),
         flow,
         materializer
       );
@@ -205,7 +205,7 @@ public void testWebSocketClientFlow() {
 
 
     Flow<Message, Message, CompletionStage<WebSocketUpgradeResponse>> webSocketFlow =
-      http.webSocketClientFlow(WebSocketRequest.create("ws://echo.websocket.org"));
+      http.webSocketClientFlow(WebSocketRequest.create("ws://ws.ifelse.io"));
 
 
     Pair<CompletionStage<WebSocketUpgradeResponse>, CompletionStage<Done>> pair =
diff --git a/docs/src/test/scala/docs/http/scaladsl/SingleWebSocketRequest.scala b/docs/src/test/scala/docs/http/scaladsl/SingleWebSocketRequest.scala
index a1ed9c37aa..d930c28287 100644
--- a/docs/src/test/scala/docs/http/scaladsl/SingleWebSocketRequest.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/SingleWebSocketRequest.scala
@@ -39,7 +39,7 @@ object SingleWebSocketRequest {
     // completes or fails when the connection succeeds or fails
     // and closed is a Future[Done] representing the stream completion from above
     val (upgradeResponse, closed) =
-      Http().singleWebSocketRequest(WebSocketRequest("ws://echo.websocket.org"), flow)
+      Http().singleWebSocketRequest(WebSocketRequest("ws://ws.ifelse.io"), flow)
 
     val connected = upgradeResponse.map { upgrade =>
       // just like a regular http request we can access response status which is available via upgrade.response.status
diff --git a/docs/src/test/scala/docs/http/scaladsl/WebSocketClientFlow.scala b/docs/src/test/scala/docs/http/scaladsl/WebSocketClientFlow.scala
index a4be62eaf3..7ba682037d 100644
--- a/docs/src/test/scala/docs/http/scaladsl/WebSocketClientFlow.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/WebSocketClientFlow.scala
@@ -32,7 +32,7 @@ object WebSocketClientFlow {
     val outgoing = Source.single(TextMessage("hello world!"))
 
     // flow to use (note: not re-usable!)
-    val webSocketFlow = Http().webSocketClientFlow(WebSocketRequest("ws://echo.websocket.org"))
+    val webSocketFlow = Http().webSocketClientFlow(WebSocketRequest("ws://ws.ifelse.io"))
 
     // the materialized value is a tuple with
     // upgradeResponse is a Future[WebSocketUpgradeResponse] that