diff --git a/servant-quickcheck.cabal b/servant-quickcheck.cabal
index 182c61f..d5f29ab 100644
--- a/servant-quickcheck.cabal
+++ b/servant-quickcheck.cabal
@@ -68,12 +68,13 @@ library
 
 test-suite spec
   type:                exitcode-stdio-1.0
-  ghc-options:         -Wall -O2 -threaded
+  ghc-options:         -Wall -threaded
   default-language:    Haskell2010
   hs-source-dirs:      test
   main-is:             Spec.hs
   other-modules:       Servant.QuickCheck.InternalSpec
   build-depends:       base == 4.*
+                     , base-compat
                      , servant-quickcheck
                      , hspec
                      , http-client
@@ -88,5 +89,6 @@ test-suite spec
                      , FlexibleInstances
                      , FlexibleContexts
                      , DataKinds
+                     , NoImplicitPrelude
   if flag(long-tests)
       cpp-options: -DLONG_TESTS
diff --git a/test/Servant/QuickCheck/InternalSpec.hs b/test/Servant/QuickCheck/InternalSpec.hs
index 0f72b7c..c9bc333 100644
--- a/test/Servant/QuickCheck/InternalSpec.hs
+++ b/test/Servant/QuickCheck/InternalSpec.hs
@@ -1,18 +1,18 @@
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 module Servant.QuickCheck.InternalSpec (spec) where
 
-import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
-import Control.Monad.IO.Class (liftIO)
-import Data.Proxy
-import Servant
-import Test.Hspec
-import Test.QuickCheck
-import Servant.API.Internal.Test.ComprehensiveAPI
+import           Control.Concurrent.MVar                    (newMVar, readMVar,
+                                                             swapMVar)
+import           Control.Monad.IO.Class                     (liftIO)
+import           Prelude.Compat
+import           Servant
+import           Servant.API.Internal.Test.ComprehensiveAPI (comprehensiveAPI)
+import           Test.Hspec                                 (Spec, describe, it,
+                                                             shouldBe)
 
-import Servant.QuickCheck
-
-import Servant.QuickCheck.Internal (genRequest, serverDoesntSatisfy)
+import           Servant.QuickCheck
+import           Servant.QuickCheck.Internal                (genRequest, serverDoesntSatisfy)
 
 spec :: Spec
 spec = do
@@ -79,7 +79,7 @@ ctx = BasicAuthCheck (const . return $ NoSuchUser) :. EmptyContext
 ------------------------------------------------------------------------------
 
 args :: Args
-args = stdArgs { maxSuccess = noOfTestCases }
+args = defaultArgs { maxSuccess = noOfTestCases }
 
 noOfTestCases :: Int
 #if LONG_TESTS