diff --git a/test/test_importer.py b/test/test_importer.py
index ee6d29e8e..2cff6249b 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -257,29 +257,44 @@ class ScrubbedImportTest(_common.TestCase, ImportHelper):
     def test_tags_not_scrubbed(self):
         config['plugins'] = ['scrub']
         config['scrub']['auto'] = False
-        config['import']['write'] = False
+        config['import']['write'] = True
+        for mediafile in self.import_media:
+            self.assertEqual(mediafile.artist, 'Tag Artist')
+            self.assertEqual(mediafile.album, 'Tag Album')
         self.importer.run()
-        albums = self.lib.albums()
-        self.assertEqual(len(albums), 1)
-        self.assertEqual(albums[0].albumartist, 'Tag Artist')
+        for item in self.lib.items():
+            imported_file = os.path.join(item.path)
+            imported_file = MediaFile(imported_file)
+            self.assertEqual(imported_file.artist, 'Tag Artist')
+            self.assertEqual(imported_file.album, 'Tag Album')
 
     def test_tags_restored(self):
         config['plugins'] = ['scrub']
         config['scrub']['auto'] = True
         config['import']['write'] = True
+        for mediafile in self.import_media:
+            self.assertEqual(mediafile.artist, 'Tag Artist')
+            self.assertEqual(mediafile.album, 'Tag Album')
         self.importer.run()
-        albums = self.lib.albums()
-        self.assertEqual(len(albums), 1)
-        self.assertEqual(albums[0].albumartist, 'Tag Artist')
+        for item in self.lib.items():
+            imported_file = os.path.join(item.path)
+            imported_file = MediaFile(imported_file)
+            self.assertEqual(imported_file.artist, 'Tag Artist')
+            self.assertEqual(imported_file.album, 'Tag Album')
 
     def test_tags_not_restored(self):
         config['plugins'] = ['scrub']
         config['scrub']['auto'] = True
         config['import']['write'] = False
+        for mediafile in self.import_media:
+            self.assertEqual(mediafile.artist, 'Tag Artist')
+            self.assertEqual(mediafile.album, 'Tag Album')
         self.importer.run()
-        albums = self.lib.albums()
-        self.assertEqual(len(albums), 1)
-        self.assertEqual(albums[0].albumartist, 'Tag Artist')
+        for item in self.lib.items():
+            imported_file = os.path.join(item.path)
+            imported_file = MediaFile(imported_file)
+            self.assertEqual(imported_file.artist, None)
+            self.assertEqual(imported_file.album, None)
 
 
 @_common.slow_test()