diff --git a/tests/mqtt/protocol/test_handler.py b/tests/mqtt/protocol/test_handler.py
index 829d868..3b9a280 100644
--- a/tests/mqtt/protocol/test_handler.py
+++ b/tests/mqtt/protocol/test_handler.py
@@ -50,8 +50,9 @@ class ProtocolHandlerTest(unittest.TestCase):
             try:
                 s = Session()
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888)
-                s.reader, s.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 handler = ProtocolHandler(s, self.plugin_manager)
+                handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(handler, s)
                 yield from self.stop_handler(handler, s)
                 future.set_result(True)
@@ -84,8 +85,9 @@ class ProtocolHandlerTest(unittest.TestCase):
             try:
                 s = Session()
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888, loop=self.loop)
-                s.reader, s.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 handler = ProtocolHandler(s, self.plugin_manager, loop=self.loop)
+                handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(handler, s)
                 message = yield from handler.mqtt_publish('/topic', b'test_data', QOS_0, False)
                 self.assertIsInstance(message, OutgoingApplicationMessage)
@@ -127,8 +129,9 @@ class ProtocolHandlerTest(unittest.TestCase):
         def test_coro():
             try:
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888, loop=self.loop)
-                self.session.reader, self.session.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 self.handler = ProtocolHandler(self.session, self.plugin_manager, loop=self.loop)
+                self.handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(self.handler, self.session)
                 message = yield from self.handler.mqtt_publish('/topic', b'test_data', QOS_1, False)
                 self.assertIsInstance(message, OutgoingApplicationMessage)
@@ -178,8 +181,9 @@ class ProtocolHandlerTest(unittest.TestCase):
         def test_coro():
             try:
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888, loop=self.loop)
-                self.session.reader, self.session.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 self.handler = ProtocolHandler(self.session, self.plugin_manager, loop=self.loop)
+                self.handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(self.handler, self.session)
                 message = yield from self.handler.mqtt_publish('/topic', b'test_data', QOS_2, False)
                 self.assertIsInstance(message, OutgoingApplicationMessage)
@@ -215,8 +219,9 @@ class ProtocolHandlerTest(unittest.TestCase):
         def test_coro():
             try:
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888, loop=self.loop)
-                self.session.reader, self.session.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 self.handler = ProtocolHandler(self.session, self.plugin_manager, loop=self.loop)
+                self.handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(self.handler, self.session)
                 message = yield from self.handler.mqtt_deliver_next_message()
                 self.assertIsInstance(message, IncomingApplicationMessage)
@@ -258,8 +263,9 @@ class ProtocolHandlerTest(unittest.TestCase):
         def test_coro():
             try:
                 reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888, loop=self.loop)
-                self.session.reader, self.session.writer = adapt(reader, writer)
+                reader_adapted, writer_adapted = adapt(reader, writer)
                 self.handler = ProtocolHandler(self.session, self.plugin_manager, loop=self.loop)
+                self.handler.attach_stream(reader_adapted, writer_adapted)
                 yield from self.start_handler(self.handler, self.session)
                 message = yield from self.handler.mqtt_deliver_next_message()
                 self.assertIsInstance(message, IncomingApplicationMessage)