diff --git a/test_echo_server.py b/pipe_io_server/test_pipe_io_server.py
similarity index 96%
rename from test_echo_server.py
rename to pipe_io_server/test_pipe_io_server.py
index 7902602..942674a 100644
--- a/test_echo_server.py
+++ b/pipe_io_server/test_pipe_io_server.py
@@ -9,8 +9,12 @@ from json import dumps, loads
 
 import pytest
 
-from echo_server import EchoPipeIOServer
-from pipe_io_server import PipeIOServer
+from .pipe_io_server import PipeIOServer
+
+
+class EchoPipeIOServer(PipeIOServer):
+    def handle_message(self, message):
+        self.send_message(message)
 
 
 @pytest.fixture