diff --git a/package.xml b/package.xml
index d139875..2db687a 100644
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="3">
 
   <name>camera_info_manager_py</name>
   <version>0.2.3</version>
@@ -22,10 +22,12 @@
   <build_depend>rostest</build_depend>
   <build_depend>sensor_msgs</build_depend>
 
-  <run_depend>python-rospkg</run_depend>
-  <run_depend>python-yaml</run_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>sensor_msgs</run_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</exec_depend>
+  <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</exec_depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>sensor_msgs</exec_depend>
 
   <test_depend>rosunit</test_depend>
 
diff --git a/tests/test_camera_info_manager.py b/tests/test_camera_info_manager.py
index 093dab8..cbcfc85 100755
--- a/tests/test_camera_info_manager.py
+++ b/tests/test_camera_info_manager.py
@@ -101,7 +101,7 @@ def set_calibration(calib):
         proxy = rospy.ServiceProxy('set_camera_info', SetCameraInfo)
         rsp = proxy(calib)
         return rsp
-    except rospy.ServiceException, e:
+    except rospy.ServiceException as e:
         print("Service call failed: " + str(e))
         return None