diff --git a/CMakeLists.txt b/CMakeLists.txt
index 553cf50..84928bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,5 +177,7 @@ catkin_package(
 #   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
 # endif()
 
-## Add folders to be run by python nosetests
-catkin_add_nosetests(test)
+if(CATKIN_ENABLE_TESTING)
+  ## Add folders to be run by python nosetests
+  catkin_add_nosetests(test)
+endif()