diff --git a/laser_scan_matcher/CMakeLists.txt b/laser_scan_matcher/CMakeLists.txt
index ce20592..bea0c44 100644
--- a/laser_scan_matcher/CMakeLists.txt
+++ b/laser_scan_matcher/CMakeLists.txt
@@ -13,7 +13,7 @@ set( ROS_CXX_DEPENDENCIES
   nav_msgs)
 
 # Find catkin and all required ROS components
-find_package(catkin REQUIRED COMPONENTS ${ROS_CXX_DEPENDENCIES} rostest)
+find_package(catkin REQUIRED COMPONENTS ${ROS_CXX_DEPENDENCIES})
 find_package(PCL REQUIRED QUIET)
 
 # Find csm project
@@ -68,5 +68,8 @@ install(FILES laser_scan_matcher_nodelet.xml
 install(DIRECTORY demo
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} )
 
-add_rostest(test/run.test)
-add_rostest(test/covariance.test)
+if(CATKIN_ENABLE_TESTING)
+  find_package(rostest)
+  add_rostest(test/run.test)
+  add_rostest(test/covariance.test)
+endif()