diff --git a/bioblend/_tests/TestGalaxyToolShed.py b/bioblend/_tests/TestGalaxyToolShed.py
new file mode 100644
index 000000000..e0ea7797a
--- /dev/null
+++ b/bioblend/_tests/TestGalaxyToolShed.py
@@ -0,0 +1,84 @@
+""" """
+
+from . import (
+    GalaxyTestBase,
+    test_util,
+)
+
+
+@test_util.skip_unless_galaxy("release_20.05")
+class TestGalaxyToolShed(GalaxyTestBase.GalaxyTestBase):
+
+    def test_install_old_first(self):
+        # This test uses two revisions of the same tool, where only one has
+        # repository metadata associated:
+        # 6:289d6299bd2e contains a tool version bump
+        # 7:c14c7fd4d1be is a minor fix (no repository metadata changes)
+
+        # asking to install old version immediately installs
+        # new version
+        response = self.gi.toolshed.install_repository_revision(
+            tool_shed_url="https://toolshed.g2.bx.psu.edu/",
+            name="ampvis2_alpha_diversity",
+            owner="iuc",
+            changeset_revision="289d6299bd2e",
+        )
+        assert isinstance(response, list), response
+        assert len(response) == 1
+        assert response[0]["status"] == "Installed"
+
+        installed_repos = self.gi.toolshed.get_repositories()
+        assert len(installed_repos) == 1
+        assert installed_repos[0]["installed_changeset_revision"] == "c14c7fd4d1be"
+        assert installed_repos[0]["changeset_revision"] == "c14c7fd4d1be"
+
+        self.gi.toolshed.uninstall_repository_revision(
+            name="ampvis2_alpha_diversity",
+            owner="iuc",
+            changeset_revision="c14c7fd4d1be",
+            tool_shed_url="https://toolshed.g2.bx.psu.edu/",
+            remove_from_disk=True,
+        )
+
+    def test_install_new_first(self):
+        # 6:289d6299bd2e
+        # 7:c14c7fd4d1be was not bumped
+        response = self.gi.toolshed.install_repository_revision(
+            tool_shed_url="https://toolshed.g2.bx.psu.edu/",
+            name="ampvis2_alpha_diversity",
+            owner="iuc",
+            changeset_revision="c14c7fd4d1be",
+        )
+        assert isinstance(response, list), response
+        assert len(response) == 1
+        assert response[0]["status"] == "Installed"
+
+        installed_repos = self.gi.toolshed.get_repositories()
+        assert len(installed_repos) == 1
+        assert installed_repos[0]["installed_changeset_revision"] == "c14c7fd4d1be"
+        assert installed_repos[0]["changeset_revision"] == "c14c7fd4d1be"
+
+        # install older revision
+        # -> galaxy realizes that a tool with the same version is alredy installed
+        # -> responds with a dict indicating this
+        response = self.gi.toolshed.install_repository_revision(
+            tool_shed_url="https://toolshed.g2.bx.psu.edu/",
+            name="ampvis2_alpha_diversity",
+            owner="iuc",
+            changeset_revision="289d6299bd2e",
+        )
+        assert isinstance(response, dict), response
+        assert response["status"] == "ok"
+
+        installed_repos = self.gi.toolshed.get_repositories()
+        assert len(installed_repos) == 1
+        assert installed_repos[0]["installed_changeset_revision"] == "c14c7fd4d1be"
+        assert installed_repos[0]["changeset_revision"] == "c14c7fd4d1be"
+
+        self.gi.toolshed.uninstall_repository_revision(
+            name="ampvis2_alpha_diversity",
+            owner="iuc",
+            changeset_revision="c14c7fd4d1be",
+            tool_shed_url="https://toolshed.g2.bx.psu.edu/",
+            remove_from_disk=True,
+        )
diff --git a/bioblend/galaxy/toolshed/__init__.py b/bioblend/galaxy/toolshed/__init__.py
index 46a0f194c..38d807783 100644
--- a/bioblend/galaxy/toolshed/__init__.py
+++ b/bioblend/galaxy/toolshed/__init__.py
@@ -6,6 +6,7 @@
     Any,
     Optional,
     TYPE_CHECKING,
+    Union,
 )
 
 from bioblend.galaxy.client import Client
@@ -80,7 +81,7 @@ def install_repository_revision(
         install_resolver_dependencies: bool = False,
         tool_panel_section_id: Optional[str] = None,
         new_tool_panel_section_label: Optional[str] = None,
-    ) -> dict[str, Any]:
+    ) -> Union[list[dict[str, Any]], dict[str, str]]:
         """
         Install a specified repository revision from a specified Tool Shed into
         this Galaxy instance. This example demonstrates installation of a repository