diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py
index 03b647a0d..e4f5b8a29 100644
--- a/beets/dbcore/query.py
+++ b/beets/dbcore/query.py
@@ -158,7 +158,8 @@ class NoneQuery(FieldQuery):
         return self.field + " IS NULL", ()
 
     def match(self, item):
-        return self.value_match(self.pattern, item.get(self.field, default=None))
+        return self.value_match(self.pattern,
+                                item.get(self.field, default=None))
 
     def value_match(self, pattern, value):
         return value is pattern
diff --git a/test/test_query.py b/test/test_query.py
index aa41497b7..10206eb98 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -788,11 +788,11 @@ class NoneQueryTest(unittest.TestCase, TestHelper):
         self.assertInResult(item, matched)
 
     def test_query_repr(self):
-        self.assertEquals("NoneQuery('rg_track_gain', True)",
+        self.assertEquals("NoneQuery(u'rg_track_gain', True)",
                           str(NoneQuery(u'rg_track_gain')))
-        self.assertEquals("NoneQuery('rg_track_gain', True)",
+        self.assertEquals("NoneQuery(u'rg_track_gain', True)",
                           str(NoneQuery(u'rg_track_gain', fast=True)))
-        self.assertEquals("NoneQuery('rg_track_gain', False)",
+        self.assertEquals("NoneQuery(u'rg_track_gain', False)",
                           str(NoneQuery(u'rg_track_gain', fast=False)))