diff --git a/modules/test/Makefile b/modules/test/Makefile
index 9565fe9..4d62fd1 100644
--- a/modules/test/Makefile
+++ b/modules/test/Makefile
@@ -12,7 +12,7 @@
 RULEDIR					?= $(TOPDIR)/mk
 NAME					 = ut
 TARGET					 = $(NAME).exe
-SUBDIRS					 =
+SUBDIRS					 = test-lib
 USE_SO_VERSION           =
 
 # ------------------------------------------------------------------------------

diff --git a/modules/test/Makefile b/modules/test/Makefile
index 9565fe9..4d62fd1 100644
--- a/modules/test/Makefile
+++ b/modules/test/Makefile
@@ -12,7 +12,7 @@
 RULEDIR					?= $(TOPDIR)/mk
 NAME					 = ut
 TARGET					 = $(NAME).exe
-SUBDIRS					 =
+SUBDIRS					 = test-lib
 USE_SO_VERSION           =
 
 # ------------------------------------------------------------------------------
diff --git a/modules/test/src/ut.c b/modules/test/src/ut.c
index f91e83a..a82e002 100644
--- a/modules/test/src/ut.c
+++ b/modules/test/src/ut.c
@@ -9,21 +9,21 @@
 {
 	// UT Setup
 
-	// suite_assert();
-	// suite_dl();
-	// suite_env();
-	// suite_list_array();
-	// suite_list_linked();
-	// suite_lock_guard();
-	// suite_map();
-	// suite_memory_dump();
-	// suite_memory_entry();
-	// suite_memory_listener();
-	// suite_memory_mark();
-	// suite_memory();
-	// suite_queue();
+	suite_assert();
+	suite_dl();
+	suite_env();
+	suite_list_array();
+	suite_list_linked();
+	suite_lock_guard();
+	suite_map();
+	suite_memory_dump();
+	suite_memory_entry();
+	suite_memory_listener();
+	suite_memory_mark();
+	suite_memory();
+	suite_queue();
 	suite_socket();
-	// suite_thread();
+	suite_thread();
 
 	KcMemory_start(false);
 	KcMemory_start(true);
@@ -61,4 +61,4 @@
 {
 	ut_can_alloc_counter = counter;
 	return ut_can_alloc;
-}
\ No newline at end of file
+}