diff -r 1666cbeb1db8 -r bce0d7f2912b test/map_tests.h
--- a/test/map_tests.h	Mon Feb 20 15:30:45 2012 +0100
+++ b/test/map_tests.h	Tue Feb 21 01:13:17 2012 +0100
@@ -5,13 +5,17 @@
 #ifndef MAP_TESTS_H
 #define	MAP_TESTS_H
 
+#include "ucx/test.h"
 #include "ucx/map.h"
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-int map_tests();
+UCX_TEST_DECLARE(test_ucx_map_new)
+UCX_TEST_DECLARE(test_ucx_key)
+UCX_TEST_DECLARE(test_ucx_map_put)
+UCX_TEST_DECLARE(test_ucx_map_get)
 
 
 #ifdef	__cplusplus