diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ac5cea..c955823 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,11 +58,14 @@ SET(BUILD_SHARED_LIBS TRUE)
 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 NETGENPLUGIN documentation" ON)
 
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
+
 # Advanced options:
 OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
 
diff --git a/SalomeNETGENPLUGINConfig.cmake.in b/SalomeNETGENPLUGINConfig.cmake.in
index 6b9e9dd..9882b14 100644
--- a/SalomeNETGENPLUGINConfig.cmake.in
+++ b/SalomeNETGENPLUGINConfig.cmake.in
@@ -52,8 +52,8 @@ SET(NETGENPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@")
 #### Now the specificities
 
 # Options exported by the package:
-#SET(SALOME_NETGENPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
-SET(SALOME_NETGENPLUGIN_BUILD_DOC    @SALOME_BUILD_DOC@)
+SET(SALOME_NETGENPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@)
+SET(SALOME_NETGENPLUGIN_BUILD_DOC   @SALOME_BUILD_DOC@)
 
 # Advanced options
 SET(SALOME_NETGENPLUGIN_BUILD_GUI    @SALOME_BUILD_GUI@)