diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
index 779c09ee..0e9411b7 100644
--- a/servant-client-core/servant-client-core.cabal
+++ b/servant-client-core/servant-client-core.cabal
@@ -56,6 +56,14 @@ test-suite spec
   default-language:  Haskell2010
   hs-source-dirs:    test
   main-is:           Spec.hs
+  build-depends:
+      base
+    , base-compat
+    , deepseq
+    , servant-client-core
+    , hspec == 2.*
+    , QuickCheck >= 2.7 && < 2.10
   other-modules:
+      Servant.Client.Core.Internal.BaseUrlSpec
   build-depends:
       base == 4.*
diff --git a/servant-client/test/Servant/Common/BaseUrlSpec.hs b/servant-client-core/test/Servant/Client/Core/Internal/BaseUrlSpec.hs
similarity index 94%
rename from servant-client/test/Servant/Common/BaseUrlSpec.hs
rename to servant-client-core/test/Servant/Client/Core/Internal/BaseUrlSpec.hs
index e25da65d..09ece081 100644
--- a/servant-client/test/Servant/Common/BaseUrlSpec.hs
+++ b/servant-client-core/test/Servant/Client/Core/Internal/BaseUrlSpec.hs
@@ -1,5 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module Servant.Common.BaseUrlSpec where
+module Servant.Client.Core.Internal.BaseUrlSpec (spec) where
+
 
 import           Control.DeepSeq
 import           Prelude ()
@@ -7,7 +8,7 @@ import           Prelude.Compat
 import           Test.Hspec
 import           Test.QuickCheck
 
-import           Servant.Common.BaseUrl
+import           Servant.Client.Core.Internal.BaseUrl
 
 spec :: Spec
 spec = do
@@ -78,6 +79,3 @@ instance Arbitrary BaseUrl where
       (1, choose (1, 20000)) :
       []
     pathGen = listOf1 . elements $ letters
-
-isLeft :: Either a b -> Bool
-isLeft = either (const True) (const False)
diff --git a/servant-client-core/test/Spec.hs b/servant-client-core/test/Spec.hs
new file mode 100644
index 00000000..a824f8c3
--- /dev/null
+++ b/servant-client-core/test/Spec.hs
@@ -0,0 +1 @@
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}