diff --git a/Setup.lhs b/Setup.lhs
index 98198c6..5bde0de 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,8 +1,3 @@
 #!/usr/bin/env runhaskell
 > import Distribution.Simple
-> import System.Cmd
->
-> main = defaultMainWithHooks hooks
->   where hooks = simpleUserHooks { runTests = runTests' }
->
-> runTests' _ _ _ _ = system "tests/run.sh" >> return ()
+> main = defaultMain
diff --git a/tests/ListWidgetTest.hs b/tests/ListWidgetTest.hs
index 566d922..324668e 100644
--- a/tests/ListWidgetTest.hs
+++ b/tests/ListWidgetTest.hs
@@ -1,6 +1,4 @@
 {-# OPTIONS_GHC -XTemplateHaskell #-}
-module ListWidgetTest where
-
 import Test.Framework.TH
 import Test.Framework.Providers.QuickCheck2
 
diff --git a/vimus.cabal b/vimus.cabal
index 8090cb5..adac19e 100644
--- a/vimus.cabal
+++ b/vimus.cabal
@@ -48,3 +48,14 @@ executable vimus
     Vimus
     Widget
     WindowLayout
+
+test-suite default
+  type:             exitcode-stdio-1.0
+  main-is:          ListWidgetTest.hs
+  hs-source-dirs:   tests, src
+  build-depends:
+      QuickCheck
+    , test-framework-quickcheck2
+    , test-framework-th
+
+  cpp-options: -DTEST