diff --git a/elevation_mapping/CMakeLists.txt b/elevation_mapping/CMakeLists.txt
index e867f0c0..61f2291d 100644
--- a/elevation_mapping/CMakeLists.txt
+++ b/elevation_mapping/CMakeLists.txt
@@ -99,6 +99,7 @@ target_link_libraries(${PROJECT_NAME}
 ## Testing ##
 #############
 
+if(CATKIN_ENABLE_TESTING)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 # Add gtest based cpp test target and link libraries
 catkin_add_gtest(${PROJECT_NAME}-test
@@ -109,6 +110,7 @@ catkin_add_gtest(${PROJECT_NAME}-test
 if(TARGET ${PROJECT_NAME}-test)
   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}_library)
 endif()
+endif()
 
 #############
 ## Install ##