diff --git a/nfc_ros/CMakeLists.txt b/nfc_ros/CMakeLists.txt
index 98e3d1c62..488994054 100644
--- a/nfc_ros/CMakeLists.txt
+++ b/nfc_ros/CMakeLists.txt
@@ -20,7 +20,7 @@ catkin_package(
   CATKIN_DEPENDS message_runtime
 )
 
-if ("$ENV{ROS_DISTRO}" MATCHES "indigo")
+if ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic")
     message(WARNING "nfc_ros requires python3.6 or newer. For indigo, virtualenv generation is skipped.")
 else()
 catkin_generate_virtualenv(
@@ -36,7 +36,7 @@ install(FILES requirements.txt
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
-if(CATKIN_ENABLE_TESTING)
+if(CATKIN_ENABLE_TESTING AND ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic"))
   find_package(rostest REQUIRED)
   add_rostest(test/test_rospy_node.test
     DEPENDENCIES ${PROJECT_NAME}_generate_virtualenv