diff --git a/giambio/core.py b/giambio/core.py
index fd912a9..0c47ea8 100644
--- a/giambio/core.py
+++ b/giambio/core.py
@@ -29,6 +29,12 @@ class Task:
     def __repr__(self):
         return f"<giambio.core.Task({self.coroutine}, {self.status}, {self.joined})"
 
+    async def cancel(self):
+        return await cancel(self)
+
+    async def join(self):
+        return await join(self)
+
 
 class EventLoop:
 
diff --git a/test.py b/test.py
index 16992b7..5f13e33 100644
--- a/test.py
+++ b/test.py
@@ -23,7 +23,8 @@ async def make_srv(address: tuple):
     while True:
         conn, addr = await asock.accept()
         logging.info(f"{addr} connected")
-        loop.spawn(echo_server(conn, addr))
+        task = loop.spawn(echo_server(conn, addr))
+        await task.cancel()
 
 
 async def echo_server(sock: AsyncSocket, addr: tuple):
@@ -42,4 +43,4 @@ async def echo_server(sock: AsyncSocket, addr: tuple):
     logging.info(f"Connection from {addr} closed")
 
 
-loop.start(make_srv, ('', 1500))
+loop.start(make_srv, ('', 1501))