diff --git a/lib/galaxy_test/base/testcase.py b/lib/galaxy_test/base/testcase.py
@@ -1,6 +1,7 @@
 import logging
 import os
 import unittest
+from typing import Optional
 
 from galaxy.tool_util.verify.test_data import TestDataResolver
 from galaxy_test.base.env import setup_keep_outdir, target_url_parts
@@ -15,7 +16,7 @@ class FunctionalTestCase(unittest.TestCase):
     needs to be launched to run the test, this base class assumes a
     server is already running.
     """
-    galaxy_driver_class = None
+    galaxy_driver_class: Optional[type] = None
 
     def setUp(self):
         self.history_id = os.environ.get('GALAXY_TEST_HISTORY_ID', None)

diff --git a/lib/galaxy_test/selenium/framework.py b/lib/galaxy_test/selenium/framework.py
@@ -33,7 +33,7 @@
 try:
     from galaxy_test.driver.driver_util import GalaxyTestDriver
 except ImportError:
-    GalaxyTestDriver = None
+    GalaxyTestDriver = None  # type: ignore
 
 DEFAULT_TIMEOUT_MULTIPLIER = 1
 DEFAULT_TEST_ERRORS_DIRECTORY = os.path.abspath("database/test_errors")

diff --git a/lib/tool_shed/webapp/model/__init__.py b/lib/tool_shed/webapp/model/__init__.py
@@ -5,7 +5,7 @@
     datetime,
     timedelta
 )
-from typing import TYPE_CHECKING
+from typing import Any, Mapping, TYPE_CHECKING
 
 import tool_shed.repository_types.util as rt_util
 from galaxy import util
@@ -24,7 +24,7 @@
 
 log = logging.getLogger(__name__)
 
-WEAK_HG_REPO_CACHE = weakref.WeakKeyDictionary()
+WEAK_HG_REPO_CACHE: Mapping['Repository', Any] = weakref.WeakKeyDictionary()
 
 if TYPE_CHECKING:
     from sqlalchemy.schema import Table