diff --git a/tests/test-stream.c b/tests/test-stream.c
new file mode 100644
index 0000000..785ce58
--- /dev/null
+++ b/tests/test-stream.c
@@ -0,0 +1,54 @@
+#include <zebra.h>
+#include <stream.h>
+#include <thread.h>
+
+static long int ham = 0xdeadbeefdeadbeef;
+struct thread_master *master;
+
+static void
+print_stream (struct stream *s)
+{
+  size_t getp = stream_get_getp (s);
+  
+  printf ("endp: %ld, readable: %ld, writeable: %ld\n",
+          stream_get_endp (s),
+          STREAM_READABLE (s),
+          STREAM_WRITEABLE (s));
+  
+  while (STREAM_READABLE (s))
+    {
+      printf ("0x%x ", *stream_pnt (s));
+      stream_forward_getp (s, 1);
+    }
+  
+  printf ("\n");
+  
+  /* put getp back to where it was */
+  stream_set_getp (s, getp);
+}
+
+int
+main (void)
+{
+  struct stream *s;
+  
+  s = stream_new (1024);
+  
+  stream_putc (s, ham);
+  stream_putw (s, ham);
+  stream_putl (s, ham);
+  stream_putq (s, ham);
+  
+  print_stream (s);
+  
+  stream_resize (s, stream_get_endp (s));
+  
+  print_stream (s);
+  
+  printf ("c: 0x%hhx\n", stream_getc (s));
+  printf ("w: 0x%hx\n", stream_getw (s));
+  printf ("l: 0x%x\n", stream_getl (s));
+  printf ("q: 0x%lx\n", stream_getq (s));
+  
+  return 0;
+}