diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
index 4327cb095..7d1352435 100644
--- a/diagnostic_aggregator/CMakeLists.txt
+++ b/diagnostic_aggregator/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(diagnostic_aggregator)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED diagnostic_msgs pluginlib roscpp rospy rostest xmlrpcpp)
+find_package(catkin REQUIRED diagnostic_msgs pluginlib roscpp rospy xmlrpcpp)
 
 catkin_package(DEPENDS diagnostic_msgs pluginlib roscpp rospy xmlrpcpp
     INCLUDE_DIRS include
@@ -38,6 +38,7 @@ add_executable(analyzer_loader test/analyzer_loader.cpp
 target_link_libraries(analyzer_loader diagnostic_aggregator)
 
 if(CATKIN_ENABLE_TESTING)
+  find_package(rostest)
   add_rostest(test/launch/test_agg.launch)
 
   # Test Analyzer loader
diff --git a/diagnostic_analysis/CMakeLists.txt b/diagnostic_analysis/CMakeLists.txt
index c20c24c87..301188b1c 100644
--- a/diagnostic_analysis/CMakeLists.txt
+++ b/diagnostic_analysis/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(diagnostic_analysis)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED diagnostic_msgs rosbag roslib rostest)
+find_package(catkin REQUIRED diagnostic_msgs rosbag roslib)
 
 catkin_package(DEPENDS diagnostic_msgs rosbag roslib)
 
diff --git a/diagnostic_updater/CMakeLists.txt b/diagnostic_updater/CMakeLists.txt
index 72f7af07d..3c081c70e 100644
--- a/diagnostic_updater/CMakeLists.txt
+++ b/diagnostic_updater/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(diagnostic_updater)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED diagnostic_msgs roscpp rostest std_msgs)
+find_package(catkin REQUIRED diagnostic_msgs roscpp std_msgs)
 
 catkin_python_setup()
 
@@ -15,6 +15,7 @@ add_executable(example src/example.cpp)
 target_link_libraries(example ${catkin_LIBRARIES})
 
 if(CATKIN_ENABLE_TESTING)
+  find_package(rostest)
   add_rostest_gtest(diagnostic_updater_test test/diagnostic_updater_test.xml test/diagnostic_updater_test.cpp)
   add_rostest(test/diagnostic_updater_fast_test.xml)
   target_link_libraries(diagnostic_updater_test ${catkin_LIBRARIES})
diff --git a/self_test/CMakeLists.txt b/self_test/CMakeLists.txt
index 2ad64a11d..1a71f0b3a 100644
--- a/self_test/CMakeLists.txt
+++ b/self_test/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(self_test)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED diagnostic_msgs diagnostic_updater roscpp rostest)
+find_package(catkin REQUIRED diagnostic_msgs diagnostic_updater roscpp)
 
 catkin_package(DEPENDS diagnostic_msgs diagnostic_updater roscpp
                INCLUDE_DIRS include
@@ -34,6 +34,7 @@ target_link_libraries(selftest_rostest ${Boost_LIBRARIES}
 )
 
 if(CATKIN_ENABLE_TESTING)
+  find_package(rostest)
   add_subdirectory(test)
 
   add_rostest(test/launch/nominal_test.launch)
diff --git a/test_diagnostic_aggregator/CMakeLists.txt b/test_diagnostic_aggregator/CMakeLists.txt
index 009cb539e..c0bbc7621 100644
--- a/test_diagnostic_aggregator/CMakeLists.txt
+++ b/test_diagnostic_aggregator/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(test_diagnostic_aggregator)
 
 # Load catkin and all dependencies required for this package
-find_package(catkin REQUIRED diagnostic_aggregator diagnostic_msgs pluginlib roscpp rospy rostest)
+find_package(catkin REQUIRED diagnostic_aggregator diagnostic_msgs pluginlib roscpp rospy)
 
 catkin_package(DEPENDS diagnostic_aggregator diagnostic_msgs pluginlib roscpp rospy
                INCLUDE_DIRS include
@@ -19,6 +19,8 @@ add_dependencies(test_diagnostic_aggregator diagnostic_msgs_gencpp)
 target_link_libraries(test_diagnostic_aggregator ${catkin_LIBRARIES})
 
 if(CATKIN_ENABLE_TESTING)
+  find_package(rostest)
+
   add_rostest(test/launch/test_match_no_analyze_analyzer_load.launch)
 
   # Tests that an item can be matched, not analyzed, and reported in "Other"