diff --git a/setup.py b/setup.py
index 09d95968a..8e1b6efe6 100755
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ setup(name='beets',
       },
 
       install_requires=[
-          'mutagen>=1.20',
+          'mutagen>=1.21',
           'munkres',
           'unidecode',
           'musicbrainzngs>=0.3',
diff --git a/test/testall.py b/test/testall.py
index f0ed0b857..c91deba55 100755
--- a/test/testall.py
+++ b/test/testall.py
@@ -24,6 +24,13 @@ pkgpath = os.path.dirname(__file__) or '.'
 sys.path.append(pkgpath)
 os.chdir(pkgpath)
 
+# Make sure we use local version of beetsplug and not system namespaced version
+# for tests
+try:
+    del sys.modules["beetsplug"]
+except KeyError:
+    pass
+
 def suite():
     s = unittest.TestSuite()
     # Get the suite() of every module in this directory beginning with