diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7925e72..96db1b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,7 @@
 PROJECT(CPPJIEBA)
+
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
+
 SET(CMAKE_INSTALL_PREFIX  /usr)
 ADD_DEFINITIONS(-std=c++0x -O3)
 IF (DEFINED ENC)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0ca8d18..ebafbdc 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,5 @@
-#SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test)
-#SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test)
 
+ADD_EXECUTABLE(segment.demo segment.cpp)
+ADD_EXECUTABLE(test_performance test_performance.cpp)
 ADD_SUBDIRECTORY(unittest)
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 4ca9c91..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: testp demo
-testp:
-	g++ -o test_performance test_performance.cpp -std=c++0x -O3
-demo:
-	g++ -o segment.demo segment.cpp -std=c++0x
diff --git a/test/testlines.gbk b/test/testdata/testlines.gbk
similarity index 100%
rename from test/testlines.gbk
rename to test/testdata/testlines.gbk
diff --git a/test/testlines.utf8 b/test/testdata/testlines.utf8
similarity index 100%
rename from test/testlines.utf8
rename to test/testdata/testlines.utf8
diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 86e9d3c..97ec91f 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -1,6 +1,7 @@
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/test)
 
 SET(GTEST_ROOT_DIR gtest-1.6.0)
+
 INCLUDE_DIRECTORIES(${GTEST_ROOT_DIR} ${GTEST_ROOT_DIR}/include)
 ADD_EXECUTABLE(test gtest_main.cc ${GTEST_ROOT_DIR}/src/gtest-all.cc)
 TARGET_LINK_LIBRARIES(test pthread)
diff --git a/test/ChineseFilterUt.cpp b/test/unittest/ChineseFilterUt.cpp
similarity index 100%
rename from test/ChineseFilterUt.cpp
rename to test/unittest/ChineseFilterUt.cpp