diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,9 @@
 # The different configurations we want to test. You could also do things like
 # change flags or use --stack-yaml to point to a different file.
 env:
+- HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack-ghc-8.6.yaml"
 - HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack-ghc-8.4.yaml"
-- HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack.yaml"
+- HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack-ghc-8.2.yaml"
 - HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack-ghc-8.0.yaml"
 - HTF_TRAVIS_STACK_ARGS="--stack-yaml ${TRAVIS_BUILD_DIR}/stack-ghc-7.10.yaml"
 
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-* 0.13.2.3 (2018-03-31)
+* 0.13.2.5 (2018-11-06)
+  - fix build problem with quickcheck:
+        https://github.com/skogsbaer/HTF/issues/70
+  - fix some compiler warnings
+  - support for GHC 8.6
+
+* 0.13.2.4 (2018-03-31)
   - fix build for ghc 8.4
 
 * 0.13.2.{0,1,2} (2017-08-06)
diff --git a/HTF.cabal b/HTF.cabal
--- a/HTF.cabal
+++ b/HTF.cabal
@@ -1,5 +1,5 @@
 Name:             HTF
-Version:          0.13.2.4
+Version:          0.13.2.5
 License:          LGPL-2.1
 License-File:     LICENSE
 Copyright:        (c) 2005-2015 Stefan Wehr
@@ -40,7 +40,9 @@
   stack.yaml
   stack-ghc-7.10.yaml
   stack-ghc-8.0.yaml
+  stack-ghc-8.2.yaml
   stack-ghc-8.4.yaml
+  stack-ghc-8.6.yaml
   tests/bbt/should_fail/BBTArgs
   tests/bbt/should_fail/*.err
   tests/bbt/should_fail/*.out
@@ -107,7 +109,7 @@
   Build-Depends:    Diff >= 0.3,
                     HUnit >= 1.2.5,
                     QuickCheck >= 2.3,
-                    aeson < 0.10 || >= 0.11,
+                    aeson >= 0.11,
                     array,
                     base == 4.*,
                     base64-bytestring,
diff --git a/Test/Framework/HUnitWrapper.hs b/Test/Framework/HUnitWrapper.hs
--- a/Test/Framework/HUnitWrapper.hs
+++ b/Test/Framework/HUnitWrapper.hs
@@ -118,7 +118,9 @@
 import Control.Monad.Trans.Control
 import Control.Monad.Trans
 import qualified Test.HUnit.Lang as HU
+#if !MIN_VERSION_HUnit(1,4,0)
 import qualified Test.HUnit.Base as HU
+#endif
 
 import Data.List ( (\\) )
 import System.IO.Unsafe (unsafePerformIO)
diff --git a/Test/Framework/Preprocessor.hs b/Test/Framework/Preprocessor.hs
--- a/Test/Framework/Preprocessor.hs
+++ b/Test/Framework/Preprocessor.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -cpp -pgmPcpphs -optP --layout -optP --hashes -optP --cpp #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE BangPatterns #-}
@@ -43,7 +44,11 @@
                                      tokenise
                                    )
 import System.IO ( hPutStrLn, stderr )
+#if MIN_VERSION_HUnit(1,4,0)
+import Test.HUnit hiding (State)
+#else
 import Test.HUnit hiding (State, Location)
+#endif
 import Control.Monad.State.Strict
 import qualified Data.List as List
 import Data.Maybe
diff --git a/Test/Framework/QuickCheckWrapper.hs b/Test/Framework/QuickCheckWrapper.hs
--- a/Test/Framework/QuickCheckWrapper.hs
+++ b/Test/Framework/QuickCheckWrapper.hs
@@ -165,7 +165,7 @@
                       quickCheckTestFail (Just (adjustOutput msg))
                   Right (NoExpectedFailure { output=msg }) ->
                       quickCheckTestFail (Just (adjustOutput msg))
-#if MIN_VERSION_QuickCheck(2,8,0)
+#if MIN_VERSION_QuickCheck(2,8,0) && !MIN_VERSION_QuickCheck(2,12,0)
                   Right (InsufficientCoverage { output=msg }) ->
                       quickCheckTestFail (Just (adjustOutput msg))
 #endif
diff --git a/stack-ghc-8.2.yaml b/stack-ghc-8.2.yaml
new file mode 100644
--- /dev/null
+++ b/stack-ghc-8.2.yaml
@@ -0,0 +1,5 @@
+resolver: lts-11.22
+flags: {}
+packages:
+- '.'
+extra-deps: []
diff --git a/stack-ghc-8.4.yaml b/stack-ghc-8.4.yaml
--- a/stack-ghc-8.4.yaml
+++ b/stack-ghc-8.4.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-03-31
+resolver: lts-12.17
 flags: {}
 packages:
 - '.'
diff --git a/stack-ghc-8.6.yaml b/stack-ghc-8.6.yaml
new file mode 100644
--- /dev/null
+++ b/stack-ghc-8.6.yaml
@@ -0,0 +1,6 @@
+resolver: nightly-2018-11-06
+flags: {}
+packages:
+- '.'
+extra-deps:
+- haskell-src-1.0.3.0
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,5 +1,6 @@
-resolver: lts-11.2
+resolver: lts-12.17
 flags: {}
 packages:
 - '.'
-extra-deps: []
+extra-deps:
+- haskell-src-1.0.3.0