diff --git a/joint_state_publisher/CMakeLists.txt b/joint_state_publisher/CMakeLists.txt
index c6b3808..7d56b8f 100644
--- a/joint_state_publisher/CMakeLists.txt
+++ b/joint_state_publisher/CMakeLists.txt
@@ -9,7 +9,7 @@ install(PROGRAMS joint_state_publisher/joint_state_publisher DESTINATION ${CATKI
 
 
 if(CATKIN_ENABLE_TESTING)
-  find_package(catkin REQUIRED COMPONENTS rostest)
+  find_package(rostest)
   add_rostest(test/test_mimic_chain.launch)
   add_rostest(test/test_mimic_cycle.launch)
 endif()
diff --git a/joint_state_publisher/package.xml b/joint_state_publisher/package.xml
index d6d5832..b3c1db7 100644
--- a/joint_state_publisher/package.xml
+++ b/joint_state_publisher/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="2">
   <name>joint_state_publisher</name>
   <version>1.12.7</version>
   <description>
@@ -13,12 +13,9 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>rospy</build_depend>
-  <build_depend>python_qt_binding</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-
-  <run_depend>rospy</run_depend>
-  <run_depend>python_qt_binding</run_depend>
-  <run_depend>sensor_msgs</run_depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>python_qt_binding</exec_depend>
+  <exec_depend>sensor_msgs</exec_depend>
 
+  <test_depend>rostest</test_depend>
 </package>