diff --git a/tests/test_version.py b/tests/test_version.py
index d391760b..8c3f9404 100644
--- a/tests/test_version.py
+++ b/tests/test_version.py
@@ -1,55 +1,58 @@
 from __future__ import absolute_import, unicode_literals
 
 import unittest
-from distutils.version import StrictVersion as SV
+from distutils.version import StrictVersion
 
 from mopidy import __version__
 
 
 class VersionTest(unittest.TestCase):
+    def assertVersionLess(self, first, second):  # noqa: N802
+        self.assertLess(StrictVersion(first), StrictVersion(second))
+
     def test_current_version_is_parsable_as_a_strict_version_number(self):
-        SV(__version__)
+        StrictVersion(__version__)
 
     def test_versions_can_be_strictly_ordered(self):
-        self.assertLess(SV('0.1.0a0'), SV('0.1.0a1'))
-        self.assertLess(SV('0.1.0a1'), SV('0.1.0a2'))
-        self.assertLess(SV('0.1.0a2'), SV('0.1.0a3'))
-        self.assertLess(SV('0.1.0a3'), SV('0.1.0'))
-        self.assertLess(SV('0.1.0'), SV('0.2.0'))
-        self.assertLess(SV('0.1.0'), SV('1.0.0'))
-        self.assertLess(SV('0.2.0'), SV('0.3.0'))
-        self.assertLess(SV('0.3.0'), SV('0.3.1'))
-        self.assertLess(SV('0.3.1'), SV('0.4.0'))
-        self.assertLess(SV('0.4.0'), SV('0.4.1'))
-        self.assertLess(SV('0.4.1'), SV('0.5.0'))
-        self.assertLess(SV('0.5.0'), SV('0.6.0'))
-        self.assertLess(SV('0.6.0'), SV('0.6.1'))
-        self.assertLess(SV('0.6.1'), SV('0.7.0'))
-        self.assertLess(SV('0.7.0'), SV('0.7.1'))
-        self.assertLess(SV('0.7.1'), SV('0.7.2'))
-        self.assertLess(SV('0.7.2'), SV('0.7.3'))
-        self.assertLess(SV('0.7.3'), SV('0.8.0'))
-        self.assertLess(SV('0.8.0'), SV('0.8.1'))
-        self.assertLess(SV('0.8.1'), SV('0.9.0'))
-        self.assertLess(SV('0.9.0'), SV('0.10.0'))
-        self.assertLess(SV('0.10.0'), SV('0.11.0'))
-        self.assertLess(SV('0.11.0'), SV('0.11.1'))
-        self.assertLess(SV('0.11.1'), SV('0.12.0'))
-        self.assertLess(SV('0.12.0'), SV('0.13.0'))
-        self.assertLess(SV('0.13.0'), SV('0.14.0'))
-        self.assertLess(SV('0.14.0'), SV('0.14.1'))
-        self.assertLess(SV('0.14.1'), SV('0.14.2'))
-        self.assertLess(SV('0.14.2'), SV('0.15.0'))
-        self.assertLess(SV('0.15.0'), SV('0.16.0'))
-        self.assertLess(SV('0.16.0'), SV('0.17.0'))
-        self.assertLess(SV('0.17.0'), SV('0.18.0'))
-        self.assertLess(SV('0.18.0'), SV('0.18.1'))
-        self.assertLess(SV('0.18.1'), SV('0.18.2'))
-        self.assertLess(SV('0.18.2'), SV('0.18.3'))
-        self.assertLess(SV('0.18.3'), SV('0.19.0'))
-        self.assertLess(SV('0.19.0'), SV('0.19.1'))
-        self.assertLess(SV('0.19.1'), SV('0.19.2'))
-        self.assertLess(SV('0.19.2'), SV('0.19.3'))
-        self.assertLess(SV('0.19.3'), SV('0.19.4'))
-        self.assertLess(SV('0.19.4'), SV(__version__))
-        self.assertLess(SV(__version__), SV('0.19.6'))
+        self.assertVersionLess('0.1.0a0', '0.1.0a1')
+        self.assertVersionLess('0.1.0a1', '0.1.0a2')
+        self.assertVersionLess('0.1.0a2', '0.1.0a3')
+        self.assertVersionLess('0.1.0a3', '0.1.0')
+        self.assertVersionLess('0.1.0', '0.2.0')
+        self.assertVersionLess('0.1.0', '1.0.0')
+        self.assertVersionLess('0.2.0', '0.3.0')
+        self.assertVersionLess('0.3.0', '0.3.1')
+        self.assertVersionLess('0.3.1', '0.4.0')
+        self.assertVersionLess('0.4.0', '0.4.1')
+        self.assertVersionLess('0.4.1', '0.5.0')
+        self.assertVersionLess('0.5.0', '0.6.0')
+        self.assertVersionLess('0.6.0', '0.6.1')
+        self.assertVersionLess('0.6.1', '0.7.0')
+        self.assertVersionLess('0.7.0', '0.7.1')
+        self.assertVersionLess('0.7.1', '0.7.2')
+        self.assertVersionLess('0.7.2', '0.7.3')
+        self.assertVersionLess('0.7.3', '0.8.0')
+        self.assertVersionLess('0.8.0', '0.8.1')
+        self.assertVersionLess('0.8.1', '0.9.0')
+        self.assertVersionLess('0.9.0', '0.10.0')
+        self.assertVersionLess('0.10.0', '0.11.0')
+        self.assertVersionLess('0.11.0', '0.11.1')
+        self.assertVersionLess('0.11.1', '0.12.0')
+        self.assertVersionLess('0.12.0', '0.13.0')
+        self.assertVersionLess('0.13.0', '0.14.0')
+        self.assertVersionLess('0.14.0', '0.14.1')
+        self.assertVersionLess('0.14.1', '0.14.2')
+        self.assertVersionLess('0.14.2', '0.15.0')
+        self.assertVersionLess('0.15.0', '0.16.0')
+        self.assertVersionLess('0.16.0', '0.17.0')
+        self.assertVersionLess('0.17.0', '0.18.0')
+        self.assertVersionLess('0.18.0', '0.18.1')
+        self.assertVersionLess('0.18.1', '0.18.2')
+        self.assertVersionLess('0.18.2', '0.18.3')
+        self.assertVersionLess('0.18.3', '0.19.0')
+        self.assertVersionLess('0.19.0', '0.19.1')
+        self.assertVersionLess('0.19.1', '0.19.2')
+        self.assertVersionLess('0.19.2', '0.19.3')
+        self.assertVersionLess('0.19.3', '0.19.4')
+        self.assertVersionLess('0.19.4', __version__)
+        self.assertVersionLess(__version__, '0.19.6')