diff --git a/tests/test_hub/test_config.py b/tests/test_hub/test_config.py
index b3a530ec..4aa8a31d 100644
--- a/tests/test_hub/test_config.py
+++ b/tests/test_hub/test_config.py
@@ -14,6 +14,9 @@ class TestHubConfig(unittest.TestCase):
 
     def setUp(self):
         self.context = mock.patch('kojihub.kojihub.context').start()
+        # load_config modfies pathinfo, make sure it is restored
+        mock.patch('koji.pathinfo').start()
+        mock.patch('koji.BASEDIR').start()
         self.tempdir = tempfile.mkdtemp()
         self.environ = {
             'koji.hub.ConfigFile': self.tempdir + '/hub.conf',
diff --git a/tests/test_lib/test_gssapi.py b/tests/test_lib/test_gssapi.py
index b4ad3adc..e5162a98 100644
--- a/tests/test_lib/test_gssapi.py
+++ b/tests/test_lib/test_gssapi.py
@@ -15,6 +15,8 @@ class TestGSSAPI(unittest.TestCase):
         self.session = koji.ClientSession('https://koji.example.com/kojihub',
                                           {})
         self.session._callMethod = mock.MagicMock(name='_callMethod')
+        self.session.logout = mock.MagicMock(name='logout')
+        # logout bypasses _callMethod. mock needed for __del__ to work
 
     def tearDown(self):
         mock.patch.stopall()