diff --git a/test/__init__.py b/test/__init__.py
index e69de29bb..419a5f1ca 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -0,0 +1,5 @@
+import glob
+import os.path
+
+for filename in glob.glob(os.path.join(os.path.dirname(__file__), "test_*.py")):
+    __import__("test." + os.path.basename(filename)[:-3])
diff --git a/test/test_similarity.py b/test/test_similarity.py
index fbfafb555..1473a633e 100644
--- a/test/test_similarity.py
+++ b/test/test_similarity.py
@@ -1,10 +1,10 @@
 import unittest
-from picard.similarity import similarity, raw_similarity
+from picard.similarity import similarity
 
 class SimilarityTest(unittest.TestCase):
 
     def test_correct(self):
-        self.failUnlessEqual(similarity("K!", "K!"), 1.0)
-        self.failUnlessEqual(similarity("BBB", "AAA"), 0.0)
-        self.failUnlessAlmostEqual(similarity("ABC", "ABB"), 0.7, 1)
+        self.failUnlessEqual(similarity(u"K!", u"K!"), 1.0)
+        self.failUnlessEqual(similarity(u"BBB", u"AAA"), 0.0)
+        self.failUnlessAlmostEqual(similarity(u"ABC", u"ABB"), 0.7, 1)