diff -r 180bc6b18fec -r 76caac0da4a0 test/main.c
--- a/test/main.c	Tue Oct 09 10:21:18 2012 +0200
+++ b/test/main.c	Tue Oct 09 15:02:40 2012 +0200
@@ -39,6 +39,7 @@
 #include "string_tests.h"
 #include "mpool_tests.h"
 #include "map_tests.h"
+#include "memstream_tests.h"
 
 int cmp_string(void* o1, void* o2, void* data) {
     return strcmp((char*)o1, (char*)o2);
@@ -162,6 +163,15 @@
         ucx_test_register(suite, test_sstr_len_cat);
         ucx_test_register(suite, test_sstrsplit);
 
+        /* UcxMemstream Tests */
+        ucx_test_register(suite, test_ucx_memseektell);
+        ucx_test_register(suite, test_ucx_memputc);
+        ucx_test_register(suite, test_ucx_memgetc);
+        ucx_test_register(suite, test_ucx_memwrite);
+        ucx_test_register(suite, test_ucx_memread);
+        ucx_test_register(suite, test_ucx_memprintf);
+        ucx_test_register(suite, test_ucx_memscanf);
+
         ucx_test_run(suite, stdout);
         fflush(stdout);
         ucx_test_suite_free(suite);