diff --git a/beets/util/confit.py b/beets/util/confit.py
index ac1cb7023..aa49f6f12 100644
--- a/beets/util/confit.py
+++ b/beets/util/confit.py
@@ -538,7 +538,7 @@ def _package_path(name):
     ``name == "__main__"``).
     """
     loader = pkgutil.get_loader(name)
-    if loader is None or name == b'__main__':
+    if loader is None or name == '__main__':
         return None
 
     if hasattr(loader, 'get_filename'):
diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py
index 6c8e3e73b..d20ef3071 100644
--- a/beets/util/functemplate.py
+++ b/beets/util/functemplate.py
@@ -559,7 +559,7 @@ class Template(object):
 
 # Performance tests.
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     import timeit
     _tmpl = Template(u'foo $bar %baz{foozle $bar barzle} $bar')
     _vars = {'bar': 'qux'}
diff --git a/beets/util/pipeline.py b/beets/util/pipeline.py
index bae06111c..4c55b53be 100644
--- a/beets/util/pipeline.py
+++ b/beets/util/pipeline.py
@@ -459,7 +459,7 @@ class Pipeline(object):
                 yield msg
 
 # Smoke test.
-if __name__ == b'__main__':
+if __name__ == '__main__':
     import time
 
     # Test a normally-terminating pipeline both in sequence and
diff --git a/beetsplug/bpd/gstplayer.py b/beetsplug/bpd/gstplayer.py
index 70d0613d5..b64cd0094 100644
--- a/beetsplug/bpd/gstplayer.py
+++ b/beetsplug/bpd/gstplayer.py
@@ -214,7 +214,7 @@ def play_complicated(paths):
     while my_paths:
         time.sleep(1)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     # A very simple command-line player. Just give it names of audio
     # files on the command line; these are all played in sequence.
     paths = [os.path.abspath(os.path.expanduser(p))
diff --git a/test/lyrics_download_samples.py b/test/lyrics_download_samples.py
index 280f076a2..21c260146 100644
--- a/test/lyrics_download_samples.py
+++ b/test/lyrics_download_samples.py
@@ -54,5 +54,5 @@ def main(argv=None):
             with safe_open_w(fn) as f:
                 f.write(html.encode('utf8'))
 
-if __name__ == b'__main__':
+if __name__ == "__main__":
     sys.exit(main())
diff --git a/test/test_art.py b/test/test_art.py
index 44b3b9bd4..1bc40a287 100644
--- a/test/test_art.py
+++ b/test/test_art.py
@@ -631,5 +631,5 @@ class EnforceRatioConfigTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_autotag.py b/test/test_autotag.py
index 00857ae97..61a4d5d6f 100644
--- a/test/test_autotag.py
+++ b/test/test_autotag.py
@@ -952,5 +952,5 @@ class EnumTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_bucket.py b/test/test_bucket.py
index 395d2a546..daade86ad 100644
--- a/test/test_bucket.py
+++ b/test/test_bucket.py
@@ -164,5 +164,5 @@ class BucketPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_config_command.py b/test/test_config_command.py
index f00594b80..77a370ce3 100644
--- a/test/test_config_command.py
+++ b/test/test_config_command.py
@@ -134,5 +134,5 @@ class ConfigCommandTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_convert.py b/test/test_convert.py
index 679b70a4f..886614822 100644
--- a/test/test_convert.py
+++ b/test/test_convert.py
@@ -237,5 +237,5 @@ class NeverConvertLossyFilesTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_datequery.py b/test/test_datequery.py
index b978d7304..c139c0c4a 100644
--- a/test/test_datequery.py
+++ b/test/test_datequery.py
@@ -127,5 +127,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index 0782fc26a..2ca3a6d23 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -658,5 +658,5 @@ class ResultsIteratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_echonest.py b/test/test_echonest.py
index f19b901d6..8a8bbd780 100644
--- a/test/test_echonest.py
+++ b/test/test_echonest.py
@@ -189,5 +189,5 @@ class EchonestCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_embedart.py b/test/test_embedart.py
index 145593829..3e3ce4bea 100644
--- a/test/test_embedart.py
+++ b/test/test_embedart.py
@@ -200,5 +200,5 @@ class ArtSimilarityTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_fetchart.py b/test/test_fetchart.py
index 065905a87..db3fef8ec 100644
--- a/test/test_fetchart.py
+++ b/test/test_fetchart.py
@@ -54,5 +54,5 @@ class FetchartCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_files.py b/test/test_files.py
index e302f0846..5af8bd5ef 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -627,5 +627,5 @@ class MkDirAllTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ftintitle.py b/test/test_ftintitle.py
index b8fa90681..711b5daa6 100644
--- a/test/test_ftintitle.py
+++ b/test/test_ftintitle.py
@@ -181,5 +181,5 @@ class FtInTitlePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ihate.py b/test/test_ihate.py
index 6567d13be..1b23964ae 100644
--- a/test/test_ihate.py
+++ b/test/test_ihate.py
@@ -50,5 +50,5 @@ class IHatePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importadded.py b/test/test_importadded.py
index 6e003ed0f..bddd884f9 100644
--- a/test/test_importadded.py
+++ b/test/test_importadded.py
@@ -171,5 +171,5 @@ class ImportAddedTest(unittest.TestCase, ImportHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importer.py b/test/test_importer.py
index ff2020ef8..4a8b20c90 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -1854,5 +1854,5 @@ def mocked_get_recording_by_id(id_, includes=[], release_status=[],
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importfeeds.py b/test/test_importfeeds.py
index df293ce63..158e8e51c 100644
--- a/test/test_importfeeds.py
+++ b/test/test_importfeeds.py
@@ -61,5 +61,5 @@ class ImportfeedsTestTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_info.py b/test/test_info.py
index 77f88e7c4..0ac1f95dd 100644
--- a/test/test_info.py
+++ b/test/test_info.py
@@ -116,5 +116,5 @@ class InfoTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
index 90d65bd26..d459606cf 100644
--- a/test/test_keyfinder.py
+++ b/test/test_keyfinder.py
@@ -81,5 +81,5 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index b397d2c21..19adab98a 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -216,5 +216,5 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_library.py b/test/test_library.py
index 60ea868fa..17d526675 100644
--- a/test/test_library.py
+++ b/test/test_library.py
@@ -1223,5 +1223,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_logging.py b/test/test_logging.py
index 4cf6d1ccc..19d9b0e1e 100644
--- a/test/test_logging.py
+++ b/test/test_logging.py
@@ -296,5 +296,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index 13bffacdb..7201de35a 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -390,5 +390,5 @@ class LyricsGooglePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mb.py b/test/test_mb.py
index 5333b2b8c..b4bfc82c7 100644
--- a/test/test_mb.py
+++ b/test/test_mb.py
@@ -491,5 +491,5 @@ class MBLibraryTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mbsync.py b/test/test_mbsync.py
index 14d349a8f..8e4825888 100644
--- a/test/test_mbsync.py
+++ b/test/test_mbsync.py
@@ -131,5 +131,5 @@ class MbsyncCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index ad83573da..9fe4cae5b 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -956,5 +956,5 @@ class MediaFieldTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mediafile_edge.py b/test/test_mediafile_edge.py
index 180c6ca2d..bf86e7f2a 100644
--- a/test/test_mediafile_edge.py
+++ b/test/test_mediafile_edge.py
@@ -399,5 +399,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_permissions.py b/test/test_permissions.py
index a1b7ddd19..d3eb6dc77 100644
--- a/test/test_permissions.py
+++ b/test/test_permissions.py
@@ -73,5 +73,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_pipeline.py b/test/test_pipeline.py
index 2af10a336..e48a62f53 100644
--- a/test/test_pipeline.py
+++ b/test/test_pipeline.py
@@ -240,5 +240,5 @@ class StageDecoratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_player.py b/test/test_player.py
index 7898fab68..c8fec446b 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -66,5 +66,5 @@ class CommandParseTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_plexupdate.py b/test/test_plexupdate.py
index a6c8741b3..2a2b1cbaf 100644
--- a/test/test_plexupdate.py
+++ b/test/test_plexupdate.py
@@ -124,5 +124,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_plugins.py b/test/test_plugins.py
index ea1756852..c1a83ec21 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -559,5 +559,5 @@ class PromptChoicesTest(TerminalImportSessionSetup, unittest.TestCase,
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_query.py b/test/test_query.py
index 5fb717c9c..7a076a0ee 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -979,5 +979,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_replaygain.py b/test/test_replaygain.py
index d0ceaf709..e3fdf18a6 100644
--- a/test/test_replaygain.py
+++ b/test/test_replaygain.py
@@ -167,5 +167,5 @@ class ReplayGainLdnsCliTest(ReplayGainCliTestBase, unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_sort.py b/test/test_sort.py
index daaca262a..16b594c9c 100644
--- a/test/test_sort.py
+++ b/test/test_sort.py
@@ -536,5 +536,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_spotify.py b/test/test_spotify.py
index 6f218c339..104497600 100644
--- a/test/test_spotify.py
+++ b/test/test_spotify.py
@@ -208,5 +208,5 @@ class SpotifyPluginTest(_common.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_template.py b/test/test_template.py
index efc900034..3ec97bea4 100644
--- a/test/test_template.py
+++ b/test/test_template.py
@@ -276,5 +276,5 @@ class EvalTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_the.py b/test/test_the.py
index 3d5c722be..422723386 100644
--- a/test/test_the.py
+++ b/test/test_the.py
@@ -64,5 +64,5 @@ class ThePluginTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_types_plugin.py b/test/test_types_plugin.py
index ed5a7552c..6a3df8051 100644
--- a/test/test_types_plugin.py
+++ b/test/test_types_plugin.py
@@ -151,5 +151,5 @@ def mktime(*args):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ui.py b/test/test_ui.py
index 4de5e9ed5..c8b6a99d3 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -1299,5 +1299,5 @@ class CommonOptionsParserTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ui_importer.py b/test/test_ui_importer.py
index 7dbf1f533..4596e781a 100644
--- a/test/test_ui_importer.py
+++ b/test/test_ui_importer.py
@@ -148,5 +148,5 @@ class GlobalGroupAlbumsImportTest(TerminalImportSessionSetup,
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_vfs.py b/test/test_vfs.py
index 6ffaa859d..0b25a1031 100644
--- a/test/test_vfs.py
+++ b/test/test_vfs.py
@@ -45,5 +45,5 @@ class VFSTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_web.py b/test/test_web.py
index 51f32567d..a8be83d73 100644
--- a/test/test_web.py
+++ b/test/test_web.py
@@ -109,5 +109,5 @@ class WebPluginTest(_common.LibTestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_zero.py b/test/test_zero.py
index e223dd787..7b90e22b3 100644
--- a/test/test_zero.py
+++ b/test/test_zero.py
@@ -124,5 +124,5 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/testall.py b/test/testall.py
index 68475e379..9148da8be 100755
--- a/test/testall.py
+++ b/test/testall.py
@@ -46,5 +46,5 @@ def suite():
             s.addTest(__import__(modname).suite())
     return s
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')