diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
index 7a7a68e62676b..5f4325158a53e 100644
--- a/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
+ROS_REPO_URI="https://github.com/ros/joint_state_publisher"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
@@ -20,3 +20,5 @@ RDEPEND="${DEPEND}
 	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
+DEPEND="${DEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index ceef7c794c185..b74086ddd5fa5 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/robot_model</remote-id>
+		<remote-id type="github">ros/joint_state_publisher</remote-id>
 	</upstream>
 </pkgmetadata>