diff --git a/tests/Main.hs b/tests/Main.hs
new file mode 100644
index 0000000..0b14f1c
--- /dev/null
+++ b/tests/Main.hs
@@ -0,0 +1,18 @@
+import Control.Monad
+import Test.HUnit
+import Test.Tests
+
+hunitTests =
+	[ ("utf8Tests", utf8Tests)
+	, ("utf16Tests", utf16Tests)
+	, ("punycodeTests", punycodeTests)
+	, ("isoTests", isoTests)
+	, ("jisTests", jisTests)
+	, ("gb18030Tests", gb18030Tests)
+	]
+
+main = do
+	identityTests
+	forM_ hunitTests $ \(name, test) -> do
+		putStrLn $ "running " ++ name
+		runTestTT test >>= print
diff --git a/tests/Test/Tester.hs b/tests/Test/Tester.hs
index cd4e18c..8dbc85d 100644
--- a/tests/Test/Tester.hs
+++ b/tests/Test/Tester.hs
@@ -53,9 +53,6 @@ charGen = let
     threeByte = choose (0x010000,0x10FFFF) >>= return.chr
     in frequency [(40,ascii),(30,oneByte),(20,twoByte),(10,threeByte)]
 
-instance Arbitrary Word8 where
-    arbitrary = choose (0x00,0xFF::Int) >>= return.fromIntegral
-
 quickCheckEncoding :: Encoding enc => enc -> IO ()
 quickCheckEncoding e = do
   quickCheck (encodingIdentity e)