diff --git a/dist/build/yampa-quicheckStub/yampa-quicheckStub-tmp/yampa-quicheckStub.hs b/dist/build/yampa-quicheckStub/yampa-quicheckStub-tmp/yampa-quicheckStub.hs
deleted file mode 100644
--- a/dist/build/yampa-quicheckStub/yampa-quicheckStub-tmp/yampa-quicheckStub.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Main ( main ) where
-import Distribution.Simple.Test.LibV09 ( stubMain )
-import YampaQC ( tests )
-main :: IO ()
-main = stubMain tests
diff --git a/tests/YampaQC.hs b/tests/YampaQC.hs
--- a/tests/YampaQC.hs
+++ b/tests/YampaQC.hs
@@ -14,14 +14,15 @@
 -- a QuickCheck predicate, which may not be possible or compatible
 -- with out goals.
 --
-module YampaQC where
+module Main where
 
 ------------------------------------------------------------------------------
 import Data.Fixed
 
-import Distribution.TestSuite.QuickCheck
 import Test.QuickCheck
 import Test.QuickCheck.Function
+import Test.Tasty (TestTree, defaultMain, testGroup)
+import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
 import FRP.Yampa.EventS (snap)
@@ -30,8 +31,11 @@
 import FRP.Yampa.LTLFuture
 
 ------------------------------------------------------------------------------
-tests :: IO [Test]
-tests = return
+main :: IO ()
+main = defaultMain tests
+
+tests :: TestTree
+tests = testGroup "Yampa QC properties"
     [ testProperty "SF based on (**2) equal to SF on (^2))" prop_arr_law1
     , testProperty "Identity"                               prop_arr_id
     , testProperty "Arrow Naturality"                       prop_arr_naturality
diff --git a/yampa-test.cabal b/yampa-test.cabal
--- a/yampa-test.cabal
+++ b/yampa-test.cabal
@@ -1,11 +1,10 @@
 name:                yampa-test
-version:             0.1.1
+version:             0.2
 synopsis:            Testing library for Yampa.
 description:
-  Testing library for Yampa.
+  Testing and dbugging library for Yampa.
   .
-  This library contains several testing and debugging facilities for Yampa.
-  In particular, it contains:
+  It contains:
   .
   * Debugging signal functions using "Debug.Trace".
   * A definition of Temporal Predicates based on LTL.
@@ -42,8 +41,8 @@
   default-language:    Haskell2010
 
 test-suite yampa-quicheck
-  type:        detailed-0.9
-  test-module: YampaQC
+  type:        exitcode-stdio-1.0
+  main-is:     YampaQC.hs
   ghc-options: -Wall
   default-language:    Haskell2010
 
@@ -53,6 +52,7 @@
     random,
     Cabal >= 1.19,
     QuickCheck,
+    tasty,
+    tasty-quickcheck,
     Yampa,
-    yampa-test,
-    cabal-test-quickcheck
+    yampa-test