diff --git a/tests/unit/hint.py b/tests/unit/hint.py
index 258f13ef..bb9e3440 100644
--- a/tests/unit/hint.py
+++ b/tests/unit/hint.py
@@ -1,31 +1,28 @@
 #!/usr/bin/env python3
 # Written by Shlomi Fish, under the MIT Expat License.
 
-# imports
-import sys
-from TAP.Simple import diag, plan, ok
-
+import unittest
 from pysollib.acard import AbstractCard
 from pysollib.hint import Base_Solver_Hint
 
 
-def shlomif_main(args):
+class MyTests(unittest.TestCase):
+    def test_output(self):
+        card = AbstractCard(1001, 0, 3, 7, 3001)
+        h = Base_Solver_Hint(None, None, base_rank=0)
 
-    plan(2)
+        got = h.card2str2(card)
+        # TEST
+        self.assertEqual(got, 'D-8', 'card2str2 works')
+        # diag('got == ' + got)
 
-    card = AbstractCard(1001, 0, 3, 7, 3001)
-    h = Base_Solver_Hint(None, None, base_rank=0)
-
-    got = h.card2str2(card)
-    # TEST
-    if not ok(got == 'D-8', 'card2str2 works'):
-        diag('got == ' + got)
-
-    got = h.card2str1(card)
-    # TEST
-    if not ok(got == '8D', 'card2str1 works'):
-        diag('got == ' + got)
+        got = h.card2str1(card)
+        # TEST
+        self.assertEqual(got, '8D', 'card2str2 works')
+        # diag('got == ' + got)
 
 
-if __name__ == "__main__":
-    sys.exit(shlomif_main(sys.argv))
+if __name__ == '__main__':
+    from pycotap import TAPTestRunner
+    suite = unittest.TestLoader().loadTestsFromTestCase(MyTests)
+    TAPTestRunner().run(suite)