diff --git a/beets/util/confit.py b/beets/util/confit.py
index 2df71fe38..88aae3459 100644
--- a/beets/util/confit.py
+++ b/beets/util/confit.py
@@ -466,7 +466,7 @@ def _package_path(name):
     ``name == "__main__"``).
     """
     loader = pkgutil.get_loader(name)
-    if loader is None or name == '__main__':
+    if loader is None or name == b'__main__':
         return None
 
     if hasattr(loader, 'get_filename'):
diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py
index ef54c2b3e..f92cdf32f 100644
--- a/beets/util/functemplate.py
+++ b/beets/util/functemplate.py
@@ -557,7 +557,7 @@ class Template(object):
 
 # Performance tests.
 
-if __name__ == '__main__':
+if __name__ == b'__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 7387a8200..a0bb6af38 100644
--- a/beets/util/pipeline.py
+++ b/beets/util/pipeline.py
@@ -459,7 +459,7 @@ class Pipeline(object):
                 yield msg
 
 # Smoke test.
-if __name__ == '__main__':
+if __name__ == b'__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 c1a29bc5b..a06e1ce11 100644
--- a/beetsplug/bpd/gstplayer.py
+++ b/beetsplug/bpd/gstplayer.py
@@ -213,7 +213,7 @@ def play_complicated(paths):
     while my_paths:
         time.sleep(1)
 
-if __name__ == '__main__':
+if __name__ == b'__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/extra/release.py b/extra/release.py
index a374ea5bd..0be3fabf4 100755
--- a/extra/release.py
+++ b/extra/release.py
@@ -299,5 +299,5 @@ def publish():
     subprocess.check_call(['twine', 'upload', path])
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     release()
diff --git a/test/lyrics_download_samples.py b/test/lyrics_download_samples.py
index 8df4dd42f..cdcaadc22 100644
--- a/test/lyrics_download_samples.py
+++ b/test/lyrics_download_samples.py
@@ -53,5 +53,5 @@ def main(argv=None):
             with safe_open_w(fn) as f:
                 f.write(html.encode('utf8'))
 
-if __name__ == "__main__":
+if __name__ == b'__main__':
     sys.exit(main())
diff --git a/test/test_art.py b/test/test_art.py
index 065c4b5b0..9c1916a5e 100644
--- a/test/test_art.py
+++ b/test/test_art.py
@@ -359,5 +359,5 @@ class ArtImporterTest(UseThePlugin):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_autotag.py b/test/test_autotag.py
index d07b70b01..bc23b7342 100644
--- a/test/test_autotag.py
+++ b/test/test_autotag.py
@@ -945,5 +945,5 @@ class EnumTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_bucket.py b/test/test_bucket.py
index 43cc1e229..582fc4fbc 100644
--- a/test/test_bucket.py
+++ b/test/test_bucket.py
@@ -153,5 +153,5 @@ class BucketPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_config_command.py b/test/test_config_command.py
index 61c95d3ff..3a9407d88 100644
--- a/test/test_config_command.py
+++ b/test/test_config_command.py
@@ -125,5 +125,5 @@ class ConfigCommandTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_convert.py b/test/test_convert.py
index 8f099924c..3fec8879e 100644
--- a/test/test_convert.py
+++ b/test/test_convert.py
@@ -226,5 +226,5 @@ class NeverConvertLossyFilesTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_datequery.py b/test/test_datequery.py
index c1745ce03..83c425099 100644
--- a/test/test_datequery.py
+++ b/test/test_datequery.py
@@ -126,5 +126,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_dbcore.py b/test/test_dbcore.py
index 5e00ec343..dffe9ae75 100644
--- a/test/test_dbcore.py
+++ b/test/test_dbcore.py
@@ -540,5 +540,5 @@ class ResultsIteratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_echonest.py b/test/test_echonest.py
index e1da6a7f2..25000be35 100644
--- a/test/test_echonest.py
+++ b/test/test_echonest.py
@@ -182,5 +182,5 @@ class EchonestCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_embedart.py b/test/test_embedart.py
index 2dfa210b1..1bbd63a9e 100644
--- a/test/test_embedart.py
+++ b/test/test_embedart.py
@@ -150,5 +150,5 @@ class EmbedartTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_fetchart.py b/test/test_fetchart.py
index a2e8239f4..090e2e68b 100644
--- a/test/test_fetchart.py
+++ b/test/test_fetchart.py
@@ -53,5 +53,5 @@ class FetchartCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_files.py b/test/test_files.py
index 319ac99f7..ce1f00287 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -623,5 +623,5 @@ class MkDirAllTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ftintitle.py b/test/test_ftintitle.py
index 080dd1d09..f3d5b7d1f 100644
--- a/test/test_ftintitle.py
+++ b/test/test_ftintitle.py
@@ -58,5 +58,5 @@ class FtInTitlePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ihate.py b/test/test_ihate.py
index d47cbe9b9..9d93493f1 100644
--- a/test/test_ihate.py
+++ b/test/test_ihate.py
@@ -48,5 +48,5 @@ class IHatePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importadded.py b/test/test_importadded.py
index cf4a0dc38..5652f0fa5 100644
--- a/test/test_importadded.py
+++ b/test/test_importadded.py
@@ -170,5 +170,5 @@ class ImportAddedTest(unittest.TestCase, ImportHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importer.py b/test/test_importer.py
index bd78cc3e9..48a489258 100644
--- a/test/test_importer.py
+++ b/test/test_importer.py
@@ -1620,5 +1620,5 @@ class ImportPretendTest(_common.TestCase, ImportHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_importfeeds.py b/test/test_importfeeds.py
index 2e9bb2d2f..4fdb3f322 100644
--- a/test/test_importfeeds.py
+++ b/test/test_importfeeds.py
@@ -43,5 +43,5 @@ class ImportfeedsTestTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_info.py b/test/test_info.py
index a0f9fec6b..8bf7760f9 100644
--- a/test/test_info.py
+++ b/test/test_info.py
@@ -95,5 +95,5 @@ class InfoTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
index b46acf514..4ddeff5f5 100644
--- a/test/test_keyfinder.py
+++ b/test/test_keyfinder.py
@@ -80,5 +80,5 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index d945431b5..59afbecb5 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -215,5 +215,5 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_library.py b/test/test_library.py
index fd4931775..961a156c9 100644
--- a/test/test_library.py
+++ b/test/test_library.py
@@ -1153,5 +1153,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_logging.py b/test/test_logging.py
index a67269b90..864fd021a 100644
--- a/test/test_logging.py
+++ b/test/test_logging.py
@@ -41,5 +41,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_lyrics.py b/test/test_lyrics.py
index 97f6c24bd..012adcc7e 100644
--- a/test/test_lyrics.py
+++ b/test/test_lyrics.py
@@ -378,5 +378,5 @@ class LyricsGooglePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mb.py b/test/test_mb.py
index 5961f207d..a38776811 100644
--- a/test/test_mb.py
+++ b/test/test_mb.py
@@ -485,5 +485,5 @@ class MBLibraryTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mbsync.py b/test/test_mbsync.py
index 61baafaf4..86ee1a3d4 100644
--- a/test/test_mbsync.py
+++ b/test/test_mbsync.py
@@ -73,5 +73,5 @@ class MbsyncCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index 9f8f6ef31..b86bc5e05 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -939,5 +939,5 @@ class MediaFieldTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_mediafile_edge.py b/test/test_mediafile_edge.py
index 965b9090c..55edf5ba5 100644
--- a/test/test_mediafile_edge.py
+++ b/test/test_mediafile_edge.py
@@ -346,5 +346,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_permissions.py b/test/test_permissions.py
index 03f04d8ce..91b1c7245 100644
--- a/test/test_permissions.py
+++ b/test/test_permissions.py
@@ -45,5 +45,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_pipeline.py b/test/test_pipeline.py
index 3523b27a0..c280db33b 100644
--- a/test/test_pipeline.py
+++ b/test/test_pipeline.py
@@ -239,5 +239,5 @@ class StageDecoratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_player.py b/test/test_player.py
index e99b78e96..e49161786 100644
--- a/test/test_player.py
+++ b/test/test_player.py
@@ -65,5 +65,5 @@ class CommandParseTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_plexupdate.py b/test/test_plexupdate.py
index 8acb729d3..64613ef0c 100644
--- a/test/test_plexupdate.py
+++ b/test/test_plexupdate.py
@@ -104,5 +104,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_plugins.py b/test/test_plugins.py
index eeac6afa4..a3b2d206c 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -202,5 +202,5 @@ class ListenersTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_query.py b/test/test_query.py
index b002e048a..505f1fb6d 100644
--- a/test/test_query.py
+++ b/test/test_query.py
@@ -549,5 +549,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_replaygain.py b/test/test_replaygain.py
index da5e55697..0d8abd3b4 100644
--- a/test/test_replaygain.py
+++ b/test/test_replaygain.py
@@ -125,5 +125,5 @@ class ReplayGainCmdCliTest(ReplayGainCliTestBase, unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_sort.py b/test/test_sort.py
index fedbc4e23..84ebc62db 100644
--- a/test/test_sort.py
+++ b/test/test_sort.py
@@ -361,5 +361,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_spotify.py b/test/test_spotify.py
index 49e647ce2..efa2ce084 100644
--- a/test/test_spotify.py
+++ b/test/test_spotify.py
@@ -206,5 +206,5 @@ class SpotifyPluginTest(_common.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_template.py b/test/test_template.py
index e7a8308b8..5bc1e16e6 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__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_the.py b/test/test_the.py
index 226c36320..ad6dd57fe 100644
--- a/test/test_the.py
+++ b/test/test_the.py
@@ -62,5 +62,5 @@ class ThePluginTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_types_plugin.py b/test/test_types_plugin.py
index 44de9fd77..1e3943a14 100644
--- a/test/test_types_plugin.py
+++ b/test/test_types_plugin.py
@@ -150,5 +150,5 @@ def mktime(*args):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ui.py b/test/test_ui.py
index 13f2ab14c..2d4d85cdd 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -1005,5 +1005,5 @@ class CompletionTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_ui_importer.py b/test/test_ui_importer.py
index 8e9640e85..30a83488b 100644
--- a/test/test_ui_importer.py
+++ b/test/test_ui_importer.py
@@ -146,5 +146,5 @@ class GlobalGroupAlbumsImportTest(TerminalImportSessionSetup,
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_vfs.py b/test/test_vfs.py
index 9d56e8eeb..0d6b280e5 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__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_web.py b/test/test_web.py
index 3b149218e..830cf68d9 100644
--- a/test/test_web.py
+++ b/test/test_web.py
@@ -106,5 +106,5 @@ class WebPluginTest(_common.LibTestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/test_zero.py b/test/test_zero.py
index 9640b580d..09a744a33 100644
--- a/test/test_zero.py
+++ b/test/test_zero.py
@@ -105,5 +105,5 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')
diff --git a/test/testall.py b/test/testall.py
index 1ea40e4e1..bc67b7feb 100755
--- a/test/testall.py
+++ b/test/testall.py
@@ -45,5 +45,5 @@ def suite():
             s.addTest(__import__(modname).suite())
     return s
 
-if __name__ == '__main__':
+if __name__ == b'__main__':
     unittest.main(defaultTest='suite')