diff --git a/test/helper.py b/test/helper.py
index 875c99643..d23f94bf2 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -202,8 +202,6 @@ class TestHelper(object):
         """
         # FIXME this should eventually be handled by a plugin manager
         beets.config['plugins'] = []
-        for plugin in beets.plugins._classes:
-            plugin.listeners = None
         beets.plugins._classes = set()
         beets.plugins._instances = {}
         Item._types = {}
diff --git a/test/test_permissions.py b/test/test_permissions.py
index 9f3ae858c..1ba58312d 100644
--- a/test/test_permissions.py
+++ b/test/test_permissions.py
@@ -15,6 +15,7 @@ class PermissionsPluginTest(unittest.TestCase, TestHelper):
 
     def tearDown(self):
         self.teardown_beets()
+        self.unload_plugins()
 
     def test_permissions_on_album_imported(self):
         self.importer = self.create_importer()