diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e85b59046f..4223696fc37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,12 +421,6 @@ configure_file("${pcl_config_h_in}" "${pcl_config_h}")
 PCL_ADD_INCLUDES(common "" "${pcl_config_h}")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/include")
 
-### ---[ Set up for tests
-enable_testing()
-
-### ---[ Set up for examples
-#include("${PCL_SOURCE_DIR}/cmake/pcl_examples.cmake")
-
 ### ---[ Add the libraries subdirectories
 include("${PCL_SOURCE_DIR}/cmake/pcl_targets.cmake")
 
diff --git a/cmake/Modules/FindGTestSource.cmake b/cmake/Modules/FindGTestSource.cmake
index 801886f1435..e4c6e133dd4 100644
--- a/cmake/Modules/FindGTestSource.cmake
+++ b/cmake/Modules/FindGTestSource.cmake
@@ -32,7 +32,8 @@ set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
 set(CMAKE_FIND_FRAMEWORK)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Gtest DEFAULT_MSG GTEST_INCLUDE_DIR GTEST_SRC_DIR)
+find_package_handle_standard_args(GTestSource DEFAULT_MSG GTEST_INCLUDE_DIR GTEST_SRC_DIR)
+set(GTEST_FOUND ${GTestSource_FOUND})
 
 mark_as_advanced(GTEST_INCLUDE_DIR GTEST_SRC_DIR)