diff --git a/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b4b5aad7f2f59362609bf33fc042762fc8987f3
--- /dev/null
+++ b/recipes-ros/image-common/camera-info-manager/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -0,0 +1,33 @@
+From 29f5630047052c24f1b506bdb743ebd53358686d Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Tue, 4 Feb 2014 16:04:23 +0100
+Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+
+---
+ camera_info_manager/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
+index f220861..8b83216 100644
+--- a/camera_info_manager/CMakeLists.txt
++++ b/camera_info_manager/CMakeLists.txt
+@@ -10,7 +10,7 @@ catkin_package(INCLUDE_DIRS include
+                DEPENDS Boost roscpp sensor_msgs
+ )
+ 
+-find_package(catkin COMPONENTS camera_calibration_parsers image_transport roscpp roslib rostest)
++find_package(catkin COMPONENTS camera_calibration_parsers image_transport roscpp roslib)
+ 
+ include_directories(SYSTEM ${camera_calibration_parsers_INCLUDE_DIRS}
+                            ${image_transport_INCLUDE_DIRS}
+@@ -34,6 +34,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
+ )
+ 
+ if(CATKIN_ENABLE_TESTING)
++  find_package(rostest)
+   # Unit test uses gtest, but needs rostest to create a ROS environment.
+   # Hence, it must be created as a normal executable, not using
+   # catkin_add_gtest() which runs an additional test without rostest.
+-- 
+1.8.3.2
+
diff --git a/recipes-ros/image-common/camera-info-manager_1.11.1.bb b/recipes-ros/image-common/camera-info-manager_1.11.1.bb
index 448cff4c829c9306c534032604527e84451d35ae..092ff98c9c529ff8a24f5a866947b01d3f6dae00 100644
--- a/recipes-ros/image-common/camera-info-manager_1.11.1.bb
+++ b/recipes-ros/image-common/camera-info-manager_1.11.1.bb
@@ -3,6 +3,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib rostest sensor-msgs"
+DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib sensor-msgs"
 
 require image-common.inc
+
+SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch;striplevel=2"