diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e0bbee3..0bda1eef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 256:
 
 * Remove uses of the deprecated `buffers` function
+* Remove uses of deprecated methods in websocket tests
 
 --------------------------------------------------------------------------------
 
diff --git a/test/beast/websocket/accept.cpp b/test/beast/websocket/accept.cpp
index d15ae045..9c1e58bf 100644
--- a/test/beast/websocket/accept.cpp
+++ b/test/beast/websocket/accept.cpp
@@ -126,7 +126,9 @@ public:
                 "\r\n");
             ws.next_layer().read_size(20);
             bool called = false;
-            api.accept_ex(ws, res_decorator{called});
+            ws.set_option(stream_base::decorator(
+                res_decorator{called}));
+            api.accept(ws);
             BEAST_EXPECT(called);
         });
 
@@ -148,15 +150,16 @@ public:
         fail_loop([&](stream<test::stream>& ws)
         {
             bool called = false;
-            api.accept_ex(ws, sbuf(
+            ws.set_option(stream_base::decorator(
+                res_decorator{called}));
+            api.accept(ws, sbuf(
                 "GET / HTTP/1.1\r\n"
                 "Host: localhost\r\n"
                 "Upgrade: websocket\r\n"
                 "Connection: upgrade\r\n"
                 "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
                 "Sec-WebSocket-Version: 13\r\n"
-                "\r\n"),
-                res_decorator{called});
+                "\r\n"));
             BEAST_EXPECT(called);
         });
 
@@ -187,11 +190,12 @@ public:
                 "\r\n");
             ws.next_layer().read_size(16);
             bool called = false;
-            api.accept_ex(ws, sbuf(
+            ws.set_option(stream_base::decorator(
+                res_decorator{called}));
+            api.accept(ws, sbuf(
                 "GET / HTTP/1.1\r\n"
                 "Host: localhost\r\n"
-                "Upgrade: websocket\r\n"),
-                res_decorator{called});
+                "Upgrade: websocket\r\n"));
             BEAST_EXPECT(called);
         });
 
@@ -228,8 +232,9 @@ public:
             fail_loop([&](stream<test::stream>& ws)
             {
                 bool called = false;
-                api.accept_ex(ws, req,
-                    res_decorator{called});
+                ws.set_option(stream_base::decorator(
+                    res_decorator{called}));
+                api.accept(ws, req);
                 BEAST_EXPECT(called);
             });
         }
@@ -343,7 +348,9 @@ public:
             try
             {
                 bool called = false;
-                api.accept_ex(ws, res_decorator{called});
+                ws.set_option(stream_base::decorator(
+                    res_decorator{called}));
+                api.accept(ws);
                 BEAST_FAIL();
             }
             catch(system_error const& se)
@@ -388,7 +395,9 @@ public:
             try
             {
                 bool called = false;
-                api.accept_ex(ws, net::buffer(
+                ws.set_option(stream_base::decorator(
+                    res_decorator{called}));
+                api.accept(ws, net::buffer(
                     "GET / HTTP/1.1\r\n"
                     "Host: localhost\r\n"
                     "Upgrade: websocket\r\n"
@@ -396,8 +405,7 @@ public:
                     "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
                     "Sec-WebSocket-Version: 13\r\n"
                     + big +
-                    "\r\n"),
-                    res_decorator{called});
+                    "\r\n"));
                 BEAST_FAIL();
             }
             catch(system_error const& se)
@@ -446,11 +454,12 @@ public:
             try
             {
                 bool called = false;
-                api.accept_ex(ws, websocket_test_suite::sbuf(
+                ws.set_option(stream_base::decorator(
+                    res_decorator{called}));
+                api.accept(ws, websocket_test_suite::sbuf(
                     "GET / HTTP/1.1\r\n"
                     "Host: localhost\r\n"
-                    "Upgrade: websocket\r\n"),
-                    res_decorator{called});
+                    "Upgrade: websocket\r\n"));
                 BEAST_FAIL();
             }
             catch(system_error const& se)
diff --git a/test/beast/websocket/handshake.cpp b/test/beast/websocket/handshake.cpp
index c8f474bd..ceb74abc 100644
--- a/test/beast/websocket/handshake.cpp
+++ b/test/beast/websocket/handshake.cpp
@@ -97,8 +97,9 @@ public:
             bool called = false;
             try
             {
-                w.handshake_ex(ws, "localhost", "/",
-                    req_decorator{called});
+                ws.set_option(stream_base::decorator(
+                    req_decorator{called}));
+                w.handshake(ws, "localhost", "/");
                 BEAST_EXPECT(called);
             }
             catch(...)
@@ -119,8 +120,9 @@ public:
             response_type res;
             try
             {
-                w.handshake_ex(ws, res, "localhost", "/",
-                    req_decorator{called});
+                ws.set_option(stream_base::decorator(
+                    req_decorator{called}));
+                w.handshake(ws, res, "localhost", "/");
                 // VFALCO validate res?
                 BEAST_EXPECT(called);
             }
@@ -355,7 +357,7 @@ public:
         po.client_max_window_bits = 0;
         po.server_no_context_takeover = false;
         po.client_no_context_takeover = false;
-        
+
         check("permessage-deflate");
 
         po.server_max_window_bits = 10;