diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82cd141..bdb5169 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ set(LIBRIME_SOVERSION 0)
 option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
 option(BUILD_STATIC "Build Rime using static libraries" OFF)
 option(BUILD_DATA "Build data for Rime" OFF)
+option(BUILD_TEST "Build gtest framwork for Rime" OFF)
 
 SET(RIME_DATA_DIR "/share/rime-data" CACHE STRING "Target directory for Rime data")
 
@@ -47,10 +48,14 @@ if(Glog_FOUND)
 endif(Glog_FOUND)
 
 find_package(Threads)
-find_package(GTest)
+
+if(BUILD_TEST)
+  find_package(GTest REQUIRED)
 if(GTEST_FOUND)
+  enable_testing()
   include_directories(${GTEST_INCLUDE_DIRS})
 endif(GTEST_FOUND)
+endif(BUILD_TEST)
 
 find_package(YamlCpp REQUIRED)
 if(YamlCpp_FOUND)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 05db7bd..205b1c9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,8 +19,5 @@ file(COPY ${PROJECT_SOURCE_DIR}/data/test/dictionary_test.dict.yaml
 
 if(NOT MSVC AND NOT XCODE_VERSION)
 set(RIME_TEST_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/rime_test${EXT})
-add_custom_command(TARGET rime_test
-                   POST_BUILD
-                   COMMAND ${RIME_TEST_EXECUTABLE}
-                   WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+add_test(rime_test ${RIME_TEST_EXECUTABLE})
 endif(NOT MSVC AND NOT XCODE_VERSION)