diff --git a/jsk_topic_tools/CMakeLists.txt b/jsk_topic_tools/CMakeLists.txt
index 312b73fa4..2860b366f 100644
--- a/jsk_topic_tools/CMakeLists.txt
+++ b/jsk_topic_tools/CMakeLists.txt
@@ -87,19 +87,17 @@ add_library(jsk_topic_tools SHARED
 add_dependencies(jsk_topic_tools ${PROJECT_NAME}_gencpp)
 target_link_libraries(jsk_topic_tools ${catkin_LIBRARIES})
 
-if (NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
-  add_rostest(test/test_topic_buffer.test)
-  add_rostest(test/test_topic_buffer_close_wait.test)
-  add_rostest(test/test_topic_buffer_fixed_rate.test)
-  add_rostest(test/test_topic_buffer_fixed_rate_and_update_rate.test)
-  add_rostest(test/test_topic_buffer_update_rate.test)
-  add_rostest(test/test_lightweight_throttle.test)
-  add_rostest(test/test_topic_compare.test)
-  add_rostest(test/test_hz_measure.test)
-  add_rostest(test/test_block.test)
-  add_rostest(test/test_connection_based_nodelet.test)
-  add_rostest(test/test_connection_based_transport.test)
-endif(NOT $ENV{ROS_DISTRO} STREQUAL "indigo")
+add_rostest(test/test_topic_buffer.test)
+add_rostest(test/test_topic_buffer_close_wait.test)
+add_rostest(test/test_topic_buffer_fixed_rate.test)
+add_rostest(test/test_topic_buffer_fixed_rate_and_update_rate.test)
+add_rostest(test/test_topic_buffer_update_rate.test)
+add_rostest(test/test_lightweight_throttle.test)
+add_rostest(test/test_topic_compare.test)
+add_rostest(test/test_hz_measure.test)
+add_rostest(test/test_block.test)
+add_rostest(test/test_connection_based_nodelet.test)
+add_rostest(test/test_connection_based_transport.test)
 
 install(TARGETS topic_buffer_server topic_buffer_client jsk_topic_tools
   ${jsk_topic_tools_nodelet_executable_names}