diff --git a/okonomiyaki/file_formats/tests/test_legacy.py b/okonomiyaki/file_formats/tests/test_legacy.py
index fabec30..4f03668 100644
--- a/okonomiyaki/file_formats/tests/test_legacy.py
+++ b/okonomiyaki/file_formats/tests/test_legacy.py
@@ -11,74 +11,74 @@ class TestGuessPlatformABI(unittest.TestCase):
     #: Known platforms that at some point have been uploaded into an EDS
     #: server.
     CONFIGURATIONS = [
-        ('cp27', 'osx_x86',  'darwin'),
-        ('cp27', 'osx_x86_64',  'darwin'),
-        ('cp27', 'rh5_x86',  'gnu'),
-        ('cp27', 'rh5_x86_64',  'gnu'),
-        ('cp27', 'win_x86',  'msvc2008'),
-        ('cp27', 'win_x86_64',  'msvc2008'),
-        ('cp30', 'osx_x86',  'darwin'),
-        ('cp30', 'osx_x86_64',  'darwin'),
-        ('cp30', 'rh5_x86',  'gnu'),
-        ('cp30', 'rh5_x86_64',  'gnu'),
-        ('cp30', 'win_x86',  'msvc2008'),
-        ('cp30', 'win_x86_64',  'msvc2008'),
-        ('cp31', 'osx_x86',  'darwin'),
-        ('cp31', 'osx_x86_64',  'darwin'),
-        ('cp31', 'rh5_x86',  'gnu'),
-        ('cp31', 'rh5_x86_64',  'gnu'),
-        ('cp31', 'win_x86',  'msvc2008'),
-        ('cp31', 'win_x86_64',  'msvc2008'),
-        ('cp32', 'osx_x86',  'darwin'),
-        ('cp32', 'osx_x86_64',  'darwin'),
-        ('cp32', 'rh5_x86',  'gnu'),
-        ('cp32', 'rh5_x86_64',  'gnu'),
-        ('cp32', 'win_x86',  'msvc2008'),
-        ('cp32', 'win_x86_64',  'msvc2008'),
-        ('cp33', 'osx_x86',  'darwin'),
-        ('cp33', 'osx_x86_64',  'darwin'),
-        ('cp33', 'rh5_x86',  'gnu'),
-        ('cp33', 'rh5_x86_64',  'gnu'),
-        ('cp33', 'win_x86',  'msvc2010'),
-        ('cp33', 'win_x86_64',  'msvc2010'),
-        ('cp34', 'osx_x86',  'darwin'),
-        ('cp34', 'osx_x86_64',  'darwin'),
-        ('cp34', 'rh5_x86',  'gnu'),
-        ('cp34', 'rh5_x86_64',  'gnu'),
-        ('cp34', 'win_x86',  'msvc2010'),
-        ('cp34', 'win_x86_64',  'msvc2010'),
-        ('cp36', 'osx_x86',  'darwin'),
-        ('cp36', 'osx_x86_64',  'darwin'),
-        ('cp36', 'rh6_x86',  'gnu'),
-        ('cp36', 'rh6_x86_64',  'gnu'),
-        ('cp36', 'rh7_x86',  'gnu'),
-        ('cp36', 'rh7_x86_64',  'gnu'),
-        ('cp36', 'win_x86',  'msvc2015'),
-        ('cp36', 'win_x86_64',  'msvc2015'),
-        ('cp38', 'osx_x86',  'darwin'),
-        ('cp38', 'osx_x86_64',  'darwin'),
-        ('cp38', 'rh7_x86',  'gnu'),
-        ('cp38', 'rh7_x86_64',  'gnu'),
-        ('cp38', 'win_x86',  'msvc2019'),
-        ('cp38', 'win_x86_64',  'msvc2019'),
-        ('ip27', 'osx_x86',  'darwin'),
-        ('ip27', 'osx_x86_64',  'darwin'),
-        ('ip27', 'rh5_x86',  'gnu'),
-        ('ip27', 'rh5_x86_64',  'gnu'),
-        ('ip27', 'win_x86',  'msvc2008'),
-        ('ip27', 'win_x86_64',  'msvc2008'),
-        ('jy27', 'osx_x86',  'darwin'),
-        ('jy27', 'osx_x86_64',  'darwin'),
-        ('jy27', 'rh5_x86',  'gnu'),
-        ('jy27', 'rh5_x86_64',  'gnu'),
-        ('jy27', 'win_x86',  'msvc2008'),
-        ('jy27', 'win_x86_64',  'msvc2008'),
-        ('pp27', 'osx_x86',  'darwin'),
-        ('pp27', 'osx_x86_64',  'darwin'),
-        ('pp27', 'rh5_x86',  'gnu'),
-        ('pp27', 'rh5_x86_64',  'gnu'),
-        ('pp27', 'win_x86',  'msvc2008'),
-        ('pp27', 'win_x86_64',  'msvc2008')]
+        ('cp27', 'osx_x86', 'darwin'),
+        ('cp27', 'osx_x86_64', 'darwin'),
+        ('cp27', 'rh5_x86', 'gnu'),
+        ('cp27', 'rh5_x86_64', 'gnu'),
+        ('cp27', 'win_x86', 'msvc2008'),
+        ('cp27', 'win_x86_64', 'msvc2008'),
+        ('cp30', 'osx_x86', 'darwin'),
+        ('cp30', 'osx_x86_64', 'darwin'),
+        ('cp30', 'rh5_x86', 'gnu'),
+        ('cp30', 'rh5_x86_64', 'gnu'),
+        ('cp30', 'win_x86', 'msvc2008'),
+        ('cp30', 'win_x86_64', 'msvc2008'),
+        ('cp31', 'osx_x86', 'darwin'),
+        ('cp31', 'osx_x86_64', 'darwin'),
+        ('cp31', 'rh5_x86', 'gnu'),
+        ('cp31', 'rh5_x86_64', 'gnu'),
+        ('cp31', 'win_x86', 'msvc2008'),
+        ('cp31', 'win_x86_64', 'msvc2008'),
+        ('cp32', 'osx_x86', 'darwin'),
+        ('cp32', 'osx_x86_64', 'darwin'),
+        ('cp32', 'rh5_x86', 'gnu'),
+        ('cp32', 'rh5_x86_64', 'gnu'),
+        ('cp32', 'win_x86', 'msvc2008'),
+        ('cp32', 'win_x86_64', 'msvc2008'),
+        ('cp33', 'osx_x86', 'darwin'),
+        ('cp33', 'osx_x86_64', 'darwin'),
+        ('cp33', 'rh5_x86', 'gnu'),
+        ('cp33', 'rh5_x86_64', 'gnu'),
+        ('cp33', 'win_x86', 'msvc2010'),
+        ('cp33', 'win_x86_64', 'msvc2010'),
+        ('cp34', 'osx_x86', 'darwin'),
+        ('cp34', 'osx_x86_64', 'darwin'),
+        ('cp34', 'rh5_x86', 'gnu'),
+        ('cp34', 'rh5_x86_64', 'gnu'),
+        ('cp34', 'win_x86', 'msvc2010'),
+        ('cp34', 'win_x86_64', 'msvc2010'),
+        ('cp36', 'osx_x86', 'darwin'),
+        ('cp36', 'osx_x86_64', 'darwin'),
+        ('cp36', 'rh6_x86', 'gnu'),
+        ('cp36', 'rh6_x86_64', 'gnu'),
+        ('cp36', 'rh7_x86', 'gnu'),
+        ('cp36', 'rh7_x86_64', 'gnu'),
+        ('cp36', 'win_x86', 'msvc2015'),
+        ('cp36', 'win_x86_64', 'msvc2015'),
+        ('cp38', 'osx_x86', 'darwin'),
+        ('cp38', 'osx_x86_64', 'darwin'),
+        ('cp38', 'rh7_x86', 'gnu'),
+        ('cp38', 'rh7_x86_64', 'gnu'),
+        ('cp38', 'win_x86', 'msvc2019'),
+        ('cp38', 'win_x86_64', 'msvc2019'),
+        ('ip27', 'osx_x86', 'darwin'),
+        ('ip27', 'osx_x86_64', 'darwin'),
+        ('ip27', 'rh5_x86', 'gnu'),
+        ('ip27', 'rh5_x86_64', 'gnu'),
+        ('ip27', 'win_x86', 'msvc2008'),
+        ('ip27', 'win_x86_64', 'msvc2008'),
+        ('jy27', 'osx_x86', 'darwin'),
+        ('jy27', 'osx_x86_64', 'darwin'),
+        ('jy27', 'rh5_x86', 'gnu'),
+        ('jy27', 'rh5_x86_64', 'gnu'),
+        ('jy27', 'win_x86', 'msvc2008'),
+        ('jy27', 'win_x86_64', 'msvc2008'),
+        ('pp27', 'osx_x86', 'darwin'),
+        ('pp27', 'osx_x86_64', 'darwin'),
+        ('pp27', 'rh5_x86', 'gnu'),
+        ('pp27', 'rh5_x86_64', 'gnu'),
+        ('pp27', 'win_x86', 'msvc2008'),
+        ('pp27', 'win_x86_64', 'msvc2008')]
 
     @parameterized.expand(sorted(CONFIGURATIONS))
     def test_known_cases(self, tag, platform, expected):
@@ -149,62 +149,62 @@ class TestGuessABITag(unittest.TestCase):
     #: server. Note that only cpython and pypy implementations are
     #: supported
     CONFIGURATIONS = [
-        ('cp27', 'osx_x86',  'cp27m'),
-        ('cp27', 'osx_x86_64',  'cp27m'),
-        ('cp27', 'rh5_x86',  'cp27m'),
-        ('cp27', 'rh5_x86_64',  'cp27m'),
-        ('cp27', 'win_x86',  'cp27m'),
-        ('cp27', 'win_x86_64',  'cp27m'),
-        ('cp30', 'osx_x86',  'cp30m'),
-        ('cp30', 'osx_x86_64',  'cp30m'),
-        ('cp30', 'rh5_x86',  'cp30m'),
-        ('cp30', 'rh5_x86_64',  'cp30m'),
-        ('cp30', 'win_x86',  'cp30m'),
-        ('cp30', 'win_x86_64',  'cp30m'),
-        ('cp31', 'osx_x86',  'cp31m'),
-        ('cp31', 'osx_x86_64',  'cp31m'),
-        ('cp31', 'rh5_x86',  'cp31m'),
-        ('cp31', 'rh5_x86_64',  'cp31m'),
-        ('cp31', 'win_x86',  'cp31m'),
-        ('cp31', 'win_x86_64',  'cp31m'),
-        ('cp32', 'osx_x86',  'cp32m'),
-        ('cp32', 'osx_x86_64',  'cp32m'),
-        ('cp32', 'rh5_x86',  'cp32m'),
-        ('cp32', 'rh5_x86_64',  'cp32m'),
-        ('cp32', 'win_x86',  'cp32m'),
-        ('cp32', 'win_x86_64',  'cp32m'),
-        ('cp33', 'osx_x86',  'cp33m'),
-        ('cp33', 'osx_x86_64',  'cp33m'),
-        ('cp33', 'rh5_x86',  'cp33m'),
-        ('cp33', 'rh5_x86_64',  'cp33m'),
-        ('cp33', 'win_x86',  'cp33m'),
-        ('cp33', 'win_x86_64',  'cp33m'),
-        ('cp34', 'osx_x86',  'cp34m'),
-        ('cp34', 'osx_x86_64',  'cp34m'),
-        ('cp34', 'rh5_x86',  'cp34m'),
-        ('cp34', 'rh5_x86_64',  'cp34m'),
-        ('cp34', 'win_x86',  'cp34m'),
-        ('cp34', 'win_x86_64',  'cp34m'),
-        ('cp36', 'osx_x86',  'cp36m'),
-        ('cp36', 'osx_x86_64',  'cp36m'),
-        ('cp36', 'rh6_x86',  'cp36m'),
-        ('cp36', 'rh6_x86_64',  'cp36m'),
-        ('cp36', 'rh7_x86',  'cp36m'),
-        ('cp36', 'rh7_x86_64',  'cp36m'),
-        ('cp36', 'win_x86',  'cp36m'),
-        ('cp36', 'win_x86_64',  'cp36m'),
-        ('cp38', 'osx_x86',  'cp38'),
-        ('cp38', 'osx_x86_64',  'cp38'),
-        ('cp38', 'rh7_x86',  'cp38'),
-        ('cp38', 'rh7_x86_64',  'cp38'),
-        ('cp38', 'win_x86',  'cp38'),
-        ('cp38', 'win_x86_64',  'cp38'),
-        ('pp27', 'osx_x86',  'cp27m'),
-        ('pp27', 'osx_x86_64',  'cp27m'),
-        ('pp27', 'rh5_x86',  'cp27m'),
-        ('pp27', 'rh5_x86_64',  'cp27m'),
-        ('pp27', 'win_x86',  'cp27m'),
-         ('pp27', 'win_x86_64',  'cp27m')]
+        ('cp27', 'osx_x86', 'cp27m'),
+        ('cp27', 'osx_x86_64', 'cp27m'),
+        ('cp27', 'rh5_x86', 'cp27m'),
+        ('cp27', 'rh5_x86_64', 'cp27m'),
+        ('cp27', 'win_x86', 'cp27m'),
+        ('cp27', 'win_x86_64', 'cp27m'),
+        ('cp30', 'osx_x86', 'cp30m'),
+        ('cp30', 'osx_x86_64', 'cp30m'),
+        ('cp30', 'rh5_x86', 'cp30m'),
+        ('cp30', 'rh5_x86_64', 'cp30m'),
+        ('cp30', 'win_x86', 'cp30m'),
+        ('cp30', 'win_x86_64', 'cp30m'),
+        ('cp31', 'osx_x86', 'cp31m'),
+        ('cp31', 'osx_x86_64', 'cp31m'),
+        ('cp31', 'rh5_x86', 'cp31m'),
+        ('cp31', 'rh5_x86_64', 'cp31m'),
+        ('cp31', 'win_x86', 'cp31m'),
+        ('cp31', 'win_x86_64', 'cp31m'),
+        ('cp32', 'osx_x86', 'cp32m'),
+        ('cp32', 'osx_x86_64', 'cp32m'),
+        ('cp32', 'rh5_x86', 'cp32m'),
+        ('cp32', 'rh5_x86_64', 'cp32m'),
+        ('cp32', 'win_x86', 'cp32m'),
+        ('cp32', 'win_x86_64', 'cp32m'),
+        ('cp33', 'osx_x86', 'cp33m'),
+        ('cp33', 'osx_x86_64', 'cp33m'),
+        ('cp33', 'rh5_x86', 'cp33m'),
+        ('cp33', 'rh5_x86_64', 'cp33m'),
+        ('cp33', 'win_x86', 'cp33m'),
+        ('cp33', 'win_x86_64', 'cp33m'),
+        ('cp34', 'osx_x86', 'cp34m'),
+        ('cp34', 'osx_x86_64', 'cp34m'),
+        ('cp34', 'rh5_x86', 'cp34m'),
+        ('cp34', 'rh5_x86_64', 'cp34m'),
+        ('cp34', 'win_x86', 'cp34m'),
+        ('cp34', 'win_x86_64', 'cp34m'),
+        ('cp36', 'osx_x86', 'cp36m'),
+        ('cp36', 'osx_x86_64', 'cp36m'),
+        ('cp36', 'rh6_x86', 'cp36m'),
+        ('cp36', 'rh6_x86_64', 'cp36m'),
+        ('cp36', 'rh7_x86', 'cp36m'),
+        ('cp36', 'rh7_x86_64', 'cp36m'),
+        ('cp36', 'win_x86', 'cp36m'),
+        ('cp36', 'win_x86_64', 'cp36m'),
+        ('cp38', 'osx_x86', 'cp38'),
+        ('cp38', 'osx_x86_64', 'cp38'),
+        ('cp38', 'rh7_x86', 'cp38'),
+        ('cp38', 'rh7_x86_64', 'cp38'),
+        ('cp38', 'win_x86', 'cp38'),
+        ('cp38', 'win_x86_64', 'cp38'),
+        ('pp27', 'osx_x86', 'cp27m'),
+        ('pp27', 'osx_x86_64', 'cp27m'),
+        ('pp27', 'rh5_x86', 'cp27m'),
+        ('pp27', 'rh5_x86_64', 'cp27m'),
+        ('pp27', 'win_x86', 'cp27m'),
+        ('pp27', 'win_x86_64', 'cp27m')]
 
     @parameterized.expand(sorted(CONFIGURATIONS))
     def test_known_cases(self, tag, platform, expected):
diff --git a/okonomiyaki/platforms/tests/test_abi.py b/okonomiyaki/platforms/tests/test_abi.py
index c14e1d2..0c8693d 100644
--- a/okonomiyaki/platforms/tests/test_abi.py
+++ b/okonomiyaki/platforms/tests/test_abi.py
@@ -6,19 +6,19 @@
 from ..abi import default_abi
 
 EXAMPLE_RUNTIMES = [
-    ('osx_x86_64', 'cpython', '2.7.10+1','darwin'),
-    ('rh5_x86_64', 'cpython', '2.7.10+1','gnu'),
-    ('win_x86', 'cpython', '2.7.10+1','msvc2008'),
-    ('win_x86', 'cpython', '3.4.3+1','msvc2010'),
-    ('win_x86', 'cpython', '3.5.0+1','msvc2015'),
-    ('win_x86', 'cpython', '3.6.0+1','msvc2015'),
-    ('win_x86', 'cpython', '3.8.8+1','msvc2019'),
-    ('osx_x86_64', 'pypy', '2.6.1+1','darwin'),
-    ('rh5_x86_64', 'pypy', '2.6.1+1','gnu'),
-    ('win_x86', 'pypy', '2.6.1+1','msvc2008'),
-    ('osx_x86_64', 'julia', '0.3.11+1','darwin'),
-    ('rh5_x86_64', 'julia', '0.3.11+1','gnu'),
-    ('win_x86', 'julia', '0.3.11+1','mingw')]
+    ('osx_x86_64', 'cpython', '2.7.10+1', 'darwin'),
+    ('rh5_x86_64', 'cpython', '2.7.10+1', 'gnu'),
+    ('win_x86', 'cpython', '2.7.10+1', 'msvc2008'),
+    ('win_x86', 'cpython', '3.4.3+1', 'msvc2010'),
+    ('win_x86', 'cpython', '3.5.0+1', 'msvc2015'),
+    ('win_x86', 'cpython', '3.6.0+1', 'msvc2015'),
+    ('win_x86', 'cpython', '3.8.8+1', 'msvc2019'),
+    ('osx_x86_64', 'pypy', '2.6.1+1', 'darwin'),
+    ('rh5_x86_64', 'pypy', '2.6.1+1', 'gnu'),
+    ('win_x86', 'pypy', '2.6.1+1', 'msvc2008'),
+    ('osx_x86_64', 'julia', '0.3.11+1', 'darwin'),
+    ('rh5_x86_64', 'julia', '0.3.11+1', 'gnu'),
+    ('win_x86', 'julia', '0.3.11+1', 'mingw')]
 
 
 class TestDefaultABI(unittest.TestCase):