diff --git a/lib/galaxy_test/base/uses_shed.py b/lib/galaxy_test/driver/uses_shed.py
similarity index 98%
rename from lib/galaxy_test/base/uses_shed.py
rename to lib/galaxy_test/driver/uses_shed.py
index 753508cefd6..796a985b170 100644
--- a/lib/galaxy_test/base/uses_shed.py
+++ b/lib/galaxy_test/driver/uses_shed.py
@@ -127,7 +127,7 @@ class UsesShed:
             )
         except AssertionError as e:
             if "Error attempting to retrieve installation information from tool shed" in unicodify(e):
-                pytest.skip("Toolshed '%s' unavailable" % tool_shed_url)
+                pytest.skip(f"Toolshed '{tool_shed_url}' unavailable")
             raise
 
     def uninstall_repository(self, owner, name, changeset, tool_shed_url="https://toolshed.g2.bx.psu.edu"):
diff --git a/packages/test_base/setup.cfg b/packages/test_base/setup.cfg
index 79bbafcee13..3ec23447276 100644
--- a/packages/test_base/setup.cfg
+++ b/packages/test_base/setup.cfg
@@ -31,8 +31,6 @@ version = 22.5.0.dev0
 [options]
 include_package_data = True
 install_requires =
-    galaxy-app
-    galaxy-data
     galaxy-tool-util
     galaxy-util
     bioblend
diff --git a/packages/test_driver/setup.cfg b/packages/test_driver/setup.cfg
index 199390f3e8b..931f5b14e85 100644
--- a/packages/test_driver/setup.cfg
+++ b/packages/test_driver/setup.cfg
@@ -32,15 +32,14 @@ version = 22.5.0.dev0
 include_package_data = True
 install_requires =
     galaxy-app
+    galaxy-config
     galaxy-data
     galaxy-test-base
     galaxy-tool-util
     galaxy-util
     galaxy-webapps
-    galaxy-web-framework
     nose
     pytest
-    PyYAML
 packages = find:
 python_requires = >=3.7
 
diff --git a/test/integration/test_data_manager.py b/test/integration/test_data_manager.py
index 41aaab91c08..334531fd63d 100644
--- a/test/integration/test_data_manager.py
+++ b/test/integration/test_data_manager.py
@@ -8,11 +8,11 @@ from galaxy_test.base.populators import (
     DatasetPopulator,
     skip_if_toolshed_down,
 )
-from galaxy_test.base.uses_shed import (
+from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import (
     CONDA_AUTO_INSTALL_JOB_TIMEOUT,
     UsesShed,
 )
-from galaxy_test.driver import integration_util
 
 FETCH_TOOL_ID = "toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.3"
 FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT = {
diff --git a/test/integration/test_data_manager_refgenie.py b/test/integration/test_data_manager_refgenie.py
index 35bceb67cb9..71947102653 100644
--- a/test/integration/test_data_manager_refgenie.py
+++ b/test/integration/test_data_manager_refgenie.py
@@ -5,11 +5,11 @@ import string
 from nose.plugins.skip import SkipTest
 
 from galaxy_test.base.populators import DatasetPopulator
-from galaxy_test.base.uses_shed import (
+from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import (
     CONDA_AUTO_INSTALL_JOB_TIMEOUT,
     UsesShed,
 )
-from galaxy_test.driver import integration_util
 
 FETCH_TOOL_ID = "toolshed.g2.bx.psu.edu/repos/devteam/data_manager_fetch_genome_dbkeys_all_fasta/data_manager_fetch_genome_all_fasta_dbkey/0.0.3"
 FETCH_GENOME_DBKEYS_ALL_FASTA_INPUT = {
diff --git a/test/integration/test_repository_operations.py b/test/integration/test_repository_operations.py
index 772410b5dcd..bdff26419dc 100644
--- a/test/integration/test_repository_operations.py
+++ b/test/integration/test_repository_operations.py
@@ -2,8 +2,8 @@ import os
 from collections import namedtuple
 
 from galaxy_test.base.populators import DatasetPopulator
-from galaxy_test.base.uses_shed import UsesShed
 from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import UsesShed
 from tool_shed.util import hg_util
 
 REPO_TYPE = namedtuple("REPO_TYPE", "name owner changeset")
diff --git a/test/integration/test_shed_tool_tests.py b/test/integration/test_shed_tool_tests.py
index 1be66a311da..2e308d85122 100644
--- a/test/integration/test_shed_tool_tests.py
+++ b/test/integration/test_shed_tool_tests.py
@@ -1,8 +1,8 @@
 import os
 
 from galaxy_test.base.populators import skip_if_toolshed_down
-from galaxy_test.base.uses_shed import UsesShed
 from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import UsesShed
 
 
 class ToolShedToolTestIntegrationTestCase(integration_util.IntegrationTestCase, UsesShed):
diff --git a/test/integration/test_workflow_invocation.py b/test/integration/test_workflow_invocation.py
index 0503c99759d..667a5a801b5 100644
--- a/test/integration/test_workflow_invocation.py
+++ b/test/integration/test_workflow_invocation.py
@@ -4,8 +4,8 @@ from galaxy_test.base.populators import (
     DatasetPopulator,
     WorkflowPopulator,
 )
-from galaxy_test.base.uses_shed import UsesShed
 from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import UsesShed
 
 
 class WorkflowInvocationTestCase(integration_util.IntegrationTestCase, UsesShed):
diff --git a/test/integration/test_workflow_refactoring.py b/test/integration/test_workflow_refactoring.py
index 3fc3a38fe1c..8a15acda6e1 100644
--- a/test/integration/test_workflow_refactoring.py
+++ b/test/integration/test_workflow_refactoring.py
@@ -15,13 +15,13 @@ from galaxy.model import (
 )
 from galaxy.workflow.refactor.schema import RefactorActionExecutionMessageTypeEnum
 from galaxy_test.base.populators import WorkflowPopulator
-from galaxy_test.base.uses_shed import UsesShed
 from galaxy_test.base.workflow_fixtures import (
     WORKFLOW_NESTED_RUNTIME_PARAMETER,
     WORKFLOW_NESTED_SIMPLE,
     WORKFLOW_NESTED_WITH_MULTIPLE_VERSIONS_TOOL,
 )
 from galaxy_test.driver import integration_util
+from galaxy_test.driver.uses_shed import UsesShed
 
 REFACTORING_SIMPLE_TEST = """
 class: GalaxyWorkflow
diff --git a/test/integration_selenium/test_workflow_repository_tool_update.py b/test/integration_selenium/test_workflow_repository_tool_update.py
index 4c21b2d126b..096606830c8 100644
--- a/test/integration_selenium/test_workflow_repository_tool_update.py
+++ b/test/integration_selenium/test_workflow_repository_tool_update.py
@@ -1,4 +1,4 @@
-from galaxy_test.base.uses_shed import UsesShed
+from galaxy_test.driver.uses_shed import UsesShed
 from .framework import (
     selenium_test,
     SeleniumIntegrationTestCase,