diff -r 86b19c98b5fd -r d2b1e67b2b48 test/main.c
--- a/test/main.c	Thu Jul 11 17:32:48 2013 +0200
+++ b/test/main.c	Fri Jul 12 20:50:18 2013 +0200
@@ -39,6 +39,7 @@
 #include "string_tests.h"
 #include "mpool_tests.h"
 #include "map_tests.h"
+#include "prop_tests.h"
 #include "buffer_tests.h"
 
 UCX_TEST_IMPLEMENT(testTestSuitePositive) {
@@ -168,8 +169,15 @@
         ucx_test_register(suite, test_ucx_map_store_load_with_mempool);
         ucx_test_register(suite, test_ucx_map_clone);
         ucx_test_register(suite, test_ucx_map_rehash);
-
-        /* UcxMemstream Tests */
+        
+        /* UcxPropertiesParser Tests */
+        ucx_test_register(suite, test_ucx_prop_new);
+        ucx_test_register(suite, test_ucx_prop_parse);
+        ucx_test_register(suite, test_ucx_prop_parse_multi);
+        ucx_test_register(suite, test_ucx_prop_parse_part);
+        ucx_test_register(suite, test_ucx_prop_parse_long);
+        
+        /* UcxBuffer Tests */
         ucx_test_register(suite, test_ucx_buffer_seektell);
         ucx_test_register(suite, test_ucx_buffer_putc);
         ucx_test_register(suite, test_ucx_buffer_putc_ax);