diff --git a/Test/Framework/Providers/QuickCheck2.hs b/Test/Framework/Providers/QuickCheck2.hs
--- a/Test/Framework/Providers/QuickCheck2.hs
+++ b/Test/Framework/Providers/QuickCheck2.hs
@@ -65,10 +65,10 @@
         tests_run_str = fmap show mb_tests_run `orElse` "an unknown number of"
 
 propertySucceeded :: PropertyResult -> Bool
-propertySucceeded pr = case pr_status pr of
-  PropertyOK -> True
-  -- NB: Simon Hengel argues in #16 that argument exhaustion should be an error even if we managed to run at least 1 test
-  _          -> False
+propertySucceeded (PropertyResult { pr_status = status, pr_tests_run = mb_n }) = case status of
+  PropertyOK                 -> True
+  PropertyArgumentsExhausted -> maybe False (/= 0) mb_n
+  _                          -> False
 
 
 data Property = forall a. Testable a => Property a
@@ -129,7 +129,11 @@
                           , expectedFailure   = False
                           , randomSeed        = gen
                           , numSuccessShrinks = 0
-                          , numTryShrinks     = 0 },
+                          , numTryShrinks     = 0
+#if MIN_VERSION_QuickCheck(2,5,0)
+                          , numTotTryShrinks  = 0
+#endif
+                          },
                   modifyMVar out_var $ \str -> return ("", str))
     return (seed, mk_state)
 
diff --git a/test-framework-quickcheck2.cabal b/test-framework-quickcheck2.cabal
--- a/test-framework-quickcheck2.cabal
+++ b/test-framework-quickcheck2.cabal
@@ -1,5 +1,5 @@
 Name:                test-framework-quickcheck2
-Version:             0.2.12.2
+Version:             0.2.12.3
 Cabal-Version:       >= 1.2.3
 Category:            Testing
 Synopsis:            QuickCheck2 support for the test-framework package.
@@ -22,7 +22,7 @@
 Library
         Exposed-Modules:        Test.Framework.Providers.QuickCheck2
 
-        Build-Depends:          test-framework >= 0.6, QuickCheck >= 2.4 && < 2.5, extensible-exceptions >= 0.1.1 && < 0.2.0
+        Build-Depends:          test-framework >= 0.6, QuickCheck >= 2.4 && < 2.6, extensible-exceptions >= 0.1.1 && < 0.2.0
         if flag(base3)
                 Build-Depends:          base >= 3 && < 4, random >= 1
         else
@@ -33,5 +33,6 @@
                                 TypeOperators
                                 MultiParamTypeClasses
                                 ExistentialQuantification
+                                CPP
 
         Ghc-Options:            -Wall