diff --git a/test/test_utils.py b/test/test_utils.py
index 25e1f02d6..0e839c9cb 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -16,8 +16,8 @@ class UnaccentTest(unittest.TestCase):
         self.assertEqual(util.unaccent(u"ænima"), u"aenima")
 
     def test_incorrect(self):
-        self.failIfEqual(util.unaccent(u"Björk"), u"Björk")
-        self.failIfEqual(util.unaccent(u"小室哲哉"), u"Tetsuya Komuro")
+        self.assertNotEqual(util.unaccent(u"Björk"), u"Björk")
+        self.assertNotEqual(util.unaccent(u"小室哲哉"), u"Tetsuya Komuro")
 
 
 class ReplaceNonAsciiTest(unittest.TestCase):
@@ -29,8 +29,8 @@ class ReplaceNonAsciiTest(unittest.TestCase):
         self.assertEqual(util.replace_non_ascii(u"小室哲哉"), u"____")
 
     def test_incorrect(self):
-        self.failIfEqual(util.replace_non_ascii(u"Lukáš"), u"Lukáš")
-        self.failIfEqual(util.replace_non_ascii(u"Lukáš"), u"Luk____")
+        self.assertNotEqual(util.replace_non_ascii(u"Lukáš"), u"Lukáš")
+        self.assertNotEqual(util.replace_non_ascii(u"Lukáš"), u"Luk____")
 
 
 class ReplaceWin32IncompatTest(unittest.TestCase):
@@ -42,7 +42,7 @@ class ReplaceWin32IncompatTest(unittest.TestCase):
                              "A_______b")
 
     def test_incorrect(self):
-        self.failIfEqual(util.replace_win32_incompat("c:\\test\\te\"st2"),
+        self.assertNotEqual(util.replace_win32_incompat("c:\\test\\te\"st2"),
                              "c:\\test\\te\"st2")
 
 
@@ -57,8 +57,8 @@ class SanitizeDateTest(unittest.TestCase):
         self.assertEqual(util.sanitize_date("2006-02"), "2006-02")
 
     def test_incorrect(self):
-        self.failIfEqual(util.sanitize_date("2006--02"), "2006-02")
-        self.failIfEqual(util.sanitize_date("2006.03.02"), "2006-03-02")
+        self.assertNotEqual(util.sanitize_date("2006--02"), "2006-02")
+        self.assertNotEqual(util.sanitize_date("2006.03.02"), "2006-03-02")
 
 class ShortFilenameTest(unittest.TestCase):
 
@@ -86,22 +86,22 @@ class TranslateArtistTest(unittest.TestCase):
 
     def test_latin(self):
         self.assertEqual(u"Jean Michel Jarre", util.translate_from_sortname(u"Jean Michel Jarre", u"Jarre, Jean Michel"))
-        self.failIfEqual(u"Jarre, Jean Michel", util.translate_from_sortname(u"Jean Michel Jarre", u"Jarre, Jean Michel"))
+        self.assertNotEqual(u"Jarre, Jean Michel", util.translate_from_sortname(u"Jean Michel Jarre", u"Jarre, Jean Michel"))
 
     def test_kanji(self):
         self.assertEqual(u"Tetsuya Komuro", util.translate_from_sortname(u"小室哲哉", u"Komuro, Tetsuya"))
-        self.failIfEqual(u"Komuro, Tetsuya", util.translate_from_sortname(u"小室哲哉", u"Komuro, Tetsuya"))
-        self.failIfEqual(u"小室哲哉", util.translate_from_sortname(u"小室哲哉", u"Komuro, Tetsuya"))
+        self.assertNotEqual(u"Komuro, Tetsuya", util.translate_from_sortname(u"小室哲哉", u"Komuro, Tetsuya"))
+        self.assertNotEqual(u"小室哲哉", util.translate_from_sortname(u"小室哲哉", u"Komuro, Tetsuya"))
 
     def test_kanji2(self):
         self.assertEqual(u"Ayumi Hamasaki & Keiko", util.translate_from_sortname(u"浜崎あゆみ & KEIKO", u"Hamasaki, Ayumi & Keiko"))
-        self.failIfEqual(u"浜崎あゆみ & KEIKO", util.translate_from_sortname(u"浜崎あゆみ & KEIKO", u"Hamasaki, Ayumi & Keiko"))
-        self.failIfEqual(u"Hamasaki, Ayumi & Keiko", util.translate_from_sortname(u"浜崎あゆみ & KEIKO", u"Hamasaki, Ayumi & Keiko"))
+        self.assertNotEqual(u"浜崎あゆみ & KEIKO", util.translate_from_sortname(u"浜崎あゆみ & KEIKO", u"Hamasaki, Ayumi & Keiko"))
+        self.assertNotEqual(u"Hamasaki, Ayumi & Keiko", util.translate_from_sortname(u"浜崎あゆみ & KEIKO", u"Hamasaki, Ayumi & Keiko"))
 
     def test_cyrillic(self):
         self.assertEqual(U"Pyotr Ilyich Tchaikovsky", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
-        self.failIfEqual(u"Tchaikovsky, Pyotr Ilyich", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
-        self.failIfEqual(u"Пётр Ильич Чайковский", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
+        self.assertNotEqual(u"Tchaikovsky, Pyotr Ilyich", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
+        self.assertNotEqual(u"Пётр Ильич Чайковский", util.translate_from_sortname(u"Пётр Ильич Чайковский", u"Tchaikovsky, Pyotr Ilyich"))
 
 		
 class FormatTimeTest(unittest.TestCase):