diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07278cd49..9d8acde2f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 # User options
 # (some options have already been defined in KERNEL) 
 # ============
-# OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) For use in the future
+OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ON)
   
 # Advanced options:
@@ -108,7 +108,11 @@ FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 IF(SALOME_USE_MPI)
   FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
 ENDIF()
-
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
+ENDIF()
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   FIND_PACKAGE(SalomeSphinx)
diff --git a/SalomeSMESHConfig.cmake.in b/SalomeSMESHConfig.cmake.in
index 8a36a1cc3..d82a2ee2a 100644
--- a/SalomeSMESHConfig.cmake.in
+++ b/SalomeSMESHConfig.cmake.in
@@ -53,6 +53,7 @@ SET(SMESH_DEFINITIONS "@GEOM_DEFINITIONS@")
 
 # Options exported by the package:
 SET(SALOME_SMESH_BUILD_DOC @SALOME_BUILD_DOC@)
+SET(SALOME_SMESH_BUILD_TESTS @SALOME_BUILD_TESTS@)
 
 # Advanced options
 SET(SALOME_SMESH_BUILD_GUI @SALOME_BUILD_GUI@)