diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a76fcc9..8cf7b65d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.0-b25
+
+* Fixes for WebSocket echo server
+
+--------------------------------------------------------------------------------
+
 1.0.0-b24
 
 * bjam use clang on MACOSX
diff --git a/test/websocket/websocket_async_echo_server.hpp b/test/websocket/websocket_async_echo_server.hpp
index f5636e06..6114628a 100644
--- a/test/websocket/websocket_async_echo_server.hpp
+++ b/test/websocket/websocket_async_echo_server.hpp
@@ -38,14 +38,14 @@ private:
     {
         template<class Body, class Fields>
         void
-        operator()(http::message<true, Body, Fields>& req)
+        operator()(http::message<true, Body, Fields>& req) const
         {
             req.fields.replace("User-Agent", "async_echo_client");
         }
 
         template<class Body, class Fields>
         void
-        operator()(http::message<false, Body, Fields>& resp)
+        operator()(http::message<false, Body, Fields>& resp) const
         {
             resp.fields.replace("Server", "async_echo_server");
         }
diff --git a/test/websocket/websocket_echo.cpp b/test/websocket/websocket_echo.cpp
index a45dddcd..514c7913 100644
--- a/test/websocket/websocket_echo.cpp
+++ b/test/websocket/websocket_echo.cpp
@@ -18,17 +18,22 @@ int main()
 
     try
     {
+        permessage_deflate pmd;
+        pmd.client_enable = true;
+        pmd.server_enable = true;
+
         beast::error_code ec;
     	async_echo_server s1{nullptr, 1};
         s1.open(endpoint_type{
             address_type::from_string("127.0.0.1"), 6000 }, ec);
         s1.set_option(read_message_max{64 * 1024 * 1024});
         s1.set_option(auto_fragment{false});
-        //s1.set_option(write_buffer_size{64 * 1024});
+        s1.set_option(pmd);
 
     	beast::websocket::sync_echo_server s2(&std::cout, endpoint_type{
 	        address_type::from_string("127.0.0.1"), 6001 });
         s2.set_option(read_message_max{64 * 1024 * 1024});
+        s2.set_option(pmd);
 
     	beast::test::sig_wait();
     }
diff --git a/test/websocket/websocket_sync_echo_server.hpp b/test/websocket/websocket_sync_echo_server.hpp
index cce37fe3..c83bc554 100644
--- a/test/websocket/websocket_sync_echo_server.hpp
+++ b/test/websocket/websocket_sync_echo_server.hpp
@@ -36,14 +36,14 @@ private:
     {
         template<class Body, class Fields>
         void
-        operator()(http::message<true, Body, Fields>& req)
+        operator()(http::message<true, Body, Fields>& req) const
         {
             req.fields.replace("User-Agent", "sync_echo_client");
         }
 
         template<class Body, class Fields>
         void
-        operator()(http::message<false, Body, Fields>& resp)
+        operator()(http::message<false, Body, Fields>& resp) const
         {
             resp.fields.replace("Server", "sync_echo_server");
         }