diff --git a/recipes-ros/cv-camera/cv-camera/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/cv-camera/cv-camera/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
new file mode 100644
index 0000000..f860061
--- /dev/null
+++ b/recipes-ros/cv-camera/cv-camera/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -0,0 +1,36 @@
+From 92cea9b1a2267dadb0b7e2409ed8a23531fad0cf Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+Date: Mon, 3 Apr 2017 18:01:56 +0200
+Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
+
+Upstream-Status: Accepted [https://github.com/OTL/cv_camera/commit/92cea9b1a2267dadb0b7e2409ed8a23531fad0cf]
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc6a658..681c64b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
+ project(cv_camera)
+ 
+ find_package(catkin REQUIRED COMPONENTS
+-  image_transport roscpp cv_bridge sensor_msgs nodelet camera_info_manager rostest roslint)
++  image_transport roscpp cv_bridge sensor_msgs nodelet camera_info_manager roslint)
+ 
+ find_package(OpenCV REQUIRED)
+ 
+@@ -86,6 +86,7 @@ roslint_cpp(
+   )
+ 
+ if (CATKIN_ENABLE_TESTING)
++  find_package(rostest REQUIRED)
+   add_rostest_gtest(test_cv_camera test/cv_camera.test
+     test/test_cv_camera.cpp)
+   target_link_libraries(test_cv_camera ${PROJECT_NAME} ${catkin_LIBRARIES})
+-- 
+2.5.5
+
diff --git a/recipes-ros/cv-camera/cv-camera_0.1.0.bb b/recipes-ros/cv-camera/cv-camera_0.1.0.bb
index 1e3f7a1..c5c3c24 100644
--- a/recipes-ros/cv-camera/cv-camera_0.1.0.bb
+++ b/recipes-ros/cv-camera/cv-camera_0.1.0.bb
@@ -3,12 +3,14 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "opencv image-transport roscpp cv-bridge sensor-msgs nodelet camera-info-manager rostest roslint"
+DEPENDS = "opencv image-transport roscpp cv-bridge sensor-msgs nodelet camera-info-manager roslint"
 
 SRC_URI = "https://github.com/OTL/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "d52b7c7386615d649cb7c0a83b910845"
 SRC_URI[sha256sum] = "f38948e279e79a7410abb341e1313a64cd8edff2e0a3086d2045a86741af14bf"
 
+SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch"
+
 S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin