diff --git a/dev-ros/combined_robot_hw_tests/Manifest b/dev-ros/combined_robot_hw_tests/Manifest
new file mode 100644
index 0000000000000..7e38aa6703d3a
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/Manifest
@@ -0,0 +1 @@
+DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.11.0.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.11.0.ebuild
new file mode 100644
index 0000000000000..26912cde9438c
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.11.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
new file mode 100644
index 0000000000000..26912cde9438c
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-controls/ros_control"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Combined Robot HW class tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/combined_robot_hw
+	dev-ros/controller_manager
+	dev-ros/controller_manager_tests
+	dev-ros/hardware_interface
+	dev-ros/roscpp
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/combined_robot_hw_tests/metadata.xml b/dev-ros/combined_robot_hw_tests/metadata.xml
new file mode 100644
index 0000000000000..3c25465fb298c
--- /dev/null
+++ b/dev-ros/combined_robot_hw_tests/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros-controls/ros_control</remote-id>
+	</upstream>
+</pkgmetadata>