diff --git a/Logs/Presence.hs b/Logs/Presence.hs
index 83cbe0684f..ec5cec209a 100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
@@ -29,11 +29,10 @@ import Data.Time.Clock.POSIX
 import Data.Time
 import System.Locale
 import qualified Data.Map as M
-import Test.QuickCheck
-import Utility.QuickCheck ()
 
 import Common.Annex
 import qualified Annex.Branch
+import Utility.QuickCheck
 
 data LogLine = LogLine {
 	date :: POSIXTime,
diff --git a/Logs/Transfer.hs b/Logs/Transfer.hs
index 018e1d4ffd..5818f5fc22 100644
--- a/Logs/Transfer.hs
+++ b/Logs/Transfer.hs
@@ -14,6 +14,7 @@ import qualified Git
 import Types.Remote
 import Types.Key
 import Utility.Percentage
+import Utility.QuickCheck
 
 import System.Posix.Types
 import Data.Time.Clock
@@ -21,8 +22,6 @@ import Data.Time.Clock.POSIX
 import Data.Time
 import System.Locale
 import Control.Concurrent
-import Test.QuickCheck
-import Utility.QuickCheck ()
 
 {- Enough information to uniquely identify a transfer, used as the filename
  - of the transfer information file. -}
diff --git a/Test.hs b/Test.hs
index 11ab33e929..623f2ab371 100644
--- a/Test.hs
+++ b/Test.hs
@@ -20,7 +20,6 @@ import System.IO.HVFS (SystemFS(..))
 import Text.JSON
 
 import Common
-import Utility.QuickCheck ()
 
 import qualified Utility.SafeCommand
 import qualified Annex
diff --git a/Types/Key.hs b/Types/Key.hs
index e955725c71..51449ca33e 100644
--- a/Types/Key.hs
+++ b/Types/Key.hs
@@ -17,10 +17,9 @@ module Types.Key (
 ) where
 
 import System.Posix.Types
-import Test.QuickCheck
-import Utility.QuickCheck ()
 
 import Common
+import Utility.QuickCheck
 
 {- A Key has a unique name, is associated with a key/value backend,
  - and may contain other optional metadata. -}
diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
index fdcbf3ef2e..5b9bdebcb8 100644
--- a/Utility/InodeCache.hs
+++ b/Utility/InodeCache.hs
@@ -9,8 +9,7 @@ module Utility.InodeCache where
 
 import Common
 import System.Posix.Types
-import Test.QuickCheck
-import Utility.QuickCheck ()
+import Utility.QuickCheck
 
 data InodeCache = InodeCache FileID FileOffset EpochTime
 	deriving (Eq, Show)
diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
index e13b6c00d9..845ff944fa 100644
--- a/Utility/QuickCheck.hs
+++ b/Utility/QuickCheck.hs
@@ -1,4 +1,4 @@
-{- QuickCheck instances
+{- QuickCheck with additional instances
  -
  - Copyright 2012 Joey Hess <joey@kitenet.net>
  -
@@ -8,9 +8,12 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
-module Utility.QuickCheck where
+module Utility.QuickCheck
+	( module X
+	, module Utility.QuickCheck
+	) where
 
-import Test.QuickCheck
+import Test.QuickCheck as X
 import Data.Time.Clock.POSIX
 import System.Posix.Types