diff --git a/greentest/test__coros_queue.py b/greentest/test__coros_queue.py
index 6ac42b5..2775b54 100644
--- a/greentest/test__coros_queue.py
+++ b/greentest/test__coros_queue.py
@@ -191,5 +191,52 @@ class TestQueue(LimitedTestCase):
         self.assertEquals('hi', e1.wait())
         self.assertEquals(0, waiting(q))
 
+
+class TestChannel(LimitedTestCase):
+
+    def test_send(self):
+        api.sleep(0.1)
+        channel = coros.queue(0)
+
+        events = []
+
+        def another_greenlet():
+            events.append(channel.wait())
+            events.append(channel.wait())
+
+        proc.spawn(another_greenlet)
+
+        events.append('sending')
+        channel.send('hello')
+        events.append('sent hello')
+        channel.send('world')
+        events.append('sent world')
+
+        self.assertEqual(['sending', 'hello', 'sent hello', 'world', 'sent world'], events)
+
+
+    def test_wait(self):
+        api.sleep(0.1)
+        channel = coros.queue(0)
+        events = []
+
+        def another_greenlet():
+            events.append('sending hello')
+            channel.send('hello')
+            events.append('sending world')
+            channel.send('world')
+            events.append('sent world')
+
+        proc.spawn(another_greenlet)
+
+        events.append('waiting')
+        events.append(channel.wait())
+        events.append(channel.wait())
+
+        self.assertEqual(['waiting', 'sending hello', 'hello', 'sending world', 'world'], events)
+        api.sleep(0)
+        self.assertEqual(['waiting', 'sending hello', 'hello', 'sending world', 'world', 'sent world'], events)
+
+
 if __name__=='__main__':
     main()