diff --git a/lib/galaxy/model/tool_shed_install/__init__.py b/lib/galaxy/model/tool_shed_install/__init__.py
index 0a94a3e729e..d2ce177c3b0 100644
--- a/lib/galaxy/model/tool_shed_install/__init__.py
+++ b/lib/galaxy/model/tool_shed_install/__init__.py
@@ -554,6 +554,7 @@ class ToolDependency(Base, _HasTable):
     type = Column(TrimmedString(40))
     status = Column(TrimmedString(255), nullable=False)
     error_message = Column(TEXT)
+    tool_shed_repository = relationship('ToolShedRepository', back_populates='tool_dependencies')
 
     # converting this one to Enum breaks the tool shed tests,
     # don't know why though -John
diff --git a/lib/galaxy/model/tool_shed_install/mapping.py b/lib/galaxy/model/tool_shed_install/mapping.py
index 33ae1ad2f22..e6650d6d9c2 100644
--- a/lib/galaxy/model/tool_shed_install/mapping.py
+++ b/lib/galaxy/model/tool_shed_install/mapping.py
@@ -42,10 +42,8 @@ install_model.ToolShedRepository.table = Table("tool_shed_repository", metadata,
 
 mapper_registry.map_imperatively(install_model.ToolShedRepository, install_model.ToolShedRepository.table, properties=dict(
     tool_versions=relation(install_model.ToolVersion, back_populates='tool_shed_repository'),
-    tool_dependencies=relation(install_model.ToolDependency,
-                               primaryjoin=(install_model.ToolShedRepository.table.c.id == install_model.ToolDependency.tool_shed_repository_id),
-                               order_by=install_model.ToolDependency.name,
-                               backref='tool_shed_repository'),
+    tool_dependencies=relation(install_model.ToolDependency, order_by=install_model.ToolDependency.name,
+        back_populates='tool_shed_repository'),
     required_repositories=relation(install_model.RepositoryRepositoryDependencyAssociation,
                                    primaryjoin=(install_model.ToolShedRepository.table.c.id == install_model.RepositoryRepositoryDependencyAssociation.tool_shed_repository_id))))