diff --git a/src/tcp/echo_server.gleam b/test/echo_server.gleam
similarity index 100%
rename from src/tcp/echo_server.gleam
rename to test/echo_server.gleam
diff --git a/test/musicplayer_test.gleam b/test/musicplayer_test.gleam
index 3d4962d..902c4da 100644
--- a/test/musicplayer_test.gleam
+++ b/test/musicplayer_test.gleam
@@ -1,30 +1,5 @@
-import gleam/list
 import gleeunit
-import simplifile
-
-import tcp/echo_server
-import tcp/tcp
 
 pub fn main() -> Nil {
   gleeunit.main()
 }
-
-pub fn tcp_send_shutdown_receive_test() {
-  let socket_path = "/tmp/musicplayer-test.sock"
-
-  let assert Ok(_) = echo_server.new(socket_path)
-  let assert Ok(socket) = tcp.connect(socket_path)
-
-  let messages = ["hello, ", "world!\n"]
-  list.each(messages, fn(message) {
-    let assert Ok(_) = tcp.send(socket, message)
-  })
-
-  let assert Ok(_) = tcp.shutdown(socket)
-
-  let timeout_ms = 100
-  assert Ok("hello, world!\n") == tcp.receive(socket, timeout_ms)
-
-  // TODO find better way to always do cleanup
-  simplifile.delete(socket_path)
-}
diff --git a/test/tcp/tcp_test.gleam b/test/tcp/tcp_test.gleam
new file mode 100644
index 0000000..364277c
--- /dev/null
+++ b/test/tcp/tcp_test.gleam
@@ -0,0 +1,30 @@
+import gleam/list
+import gleeunit
+import simplifile
+
+import echo_server
+import tcp/tcp
+
+pub fn main() -> Nil {
+  gleeunit.main()
+}
+
+pub fn tcp_send_shutdown_receive_test() {
+  let socket_path = "/tmp/musicplayer-test.sock"
+
+  let assert Ok(_) = echo_server.new(socket_path)
+  let assert Ok(socket) = tcp.connect(socket_path)
+
+  let messages = ["hello, ", "world!\n"]
+  list.each(messages, fn(message) {
+    let assert Ok(_) = tcp.send(socket, message)
+  })
+
+  let assert Ok(_) = tcp.shutdown(socket)
+
+  let timeout_ms = 100
+  assert Ok("hello, world!\n") == tcp.receive(socket, timeout_ms)
+
+  // TODO find better way to always do cleanup
+  simplifile.delete(socket_path)
+}