diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index faf5003..98ee947 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,5 +2,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test)
 
 ADD_EXECUTABLE(segment.demo segment.cpp)
 ADD_EXECUTABLE(keyword.demo keyword_demo.cpp)
+ADD_EXECUTABLE(tagging_demo tagging_demo.cpp)
 ADD_EXECUTABLE(load_test load_test.cpp)
 ADD_SUBDIRECTORY(unittest)
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 56bf087..6eafa8f 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -6,8 +6,7 @@ SET(GTEST_ROOT_DIR gtest-1.6.0)
 ADD_DEFINITIONS(-DLOGGER_LEVEL=LL_WARN)
 INCLUDE_DIRECTORIES(${GTEST_ROOT_DIR} ${GTEST_ROOT_DIR}/include ${PROJECT_SOURCE_DIR})
 ADD_LIBRARY(gtest STATIC ${GTEST_ROOT_DIR}/src/gtest-all.cc)
-FILE(GLOB SRCFILES *.cpp)
-ADD_EXECUTABLE(test.run ${SRCFILES})
+ADD_EXECUTABLE(test.run gtest_main.cpp TKeywordExtractor.cpp TMPSegment.cpp TTrie.cpp TFullSegment.cpp  TMd5.cpp TQuerySegment.cpp TTrieManager TFullSegment.cpp  TMd5.cpp TQuerySegment.cpp TTrieManager.cpp THMMSegment.cpp   TMixSegment.cpp TSegmentBase.cpp)
 TARGET_LINK_LIBRARIES(gtest pthread)
 TARGET_LINK_LIBRARIES(test.run gtest pthread)