diff --git a/test/unit/tools/test_toolbox.py b/test/unit/tools/test_toolbox.py
index dbebc07d75d..9004cfde49a 100644
--- a/test/unit/tools/test_toolbox.py
+++ b/test/unit/tools/test_toolbox.py
@@ -389,17 +389,17 @@ class ToolBoxTestCase(BaseToolBoxTestCase):
         assert section_by_label is section
         assert tool_panel_section_key == 'tid'
 
-    def test_get_tool_id(self):
+    def test_get_tool(self):
         self._init_tool()
         self._setup_two_versions_in_config()
         self._setup_two_versions()
-        assert self.toolbox.get_tool_id("test_tool") in [
+        assert self.toolbox.get_tool("test_tool").id in [
             "github.com/galaxyproject/example/test_tool/0.1",
             "github.com/galaxyproject/example/test_tool/0.2"
         ]
-        assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.1") == "github.com/galaxyproject/example/test_tool/0.1"
-        assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.2") == "github.com/galaxyproject/example/test_tool/0.2"
-        assert self.toolbox.get_tool_id("github.com/galaxyproject/example/test_tool/0.3") != "github.com/galaxyproject/example/test_tool/0.3"
+        assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.1").id == "github.com/galaxyproject/example/test_tool/0.1"
+        assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.2").id == "github.com/galaxyproject/example/test_tool/0.2"
+        assert self.toolbox.get_tool("github.com/galaxyproject/example/test_tool/0.3").id != "github.com/galaxyproject/example/test_tool/0.3"
 
     def test_tool_dir(self):
         self._init_tool()
diff --git a/test/unit/workflows/workflow_support.py b/test/unit/workflows/workflow_support.py
index fce3011fbba..a20fd6e361c 100644
--- a/test/unit/workflows/workflow_support.py
+++ b/test/unit/workflows/workflow_support.py
@@ -75,10 +75,6 @@ class TestToolbox:
         # Real tool box returns None of missing tool also
         return self.tools.get(tool_id, None)
 
-    def get_tool_id(self, tool_id):
-        tool = self.get_tool(tool_id)
-        return tool and tool.id
-
 
 def yaml_to_model(has_dict, id_offset=100):
     if isinstance(has_dict, str):