diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.8.1.2
+-------
+
+- Support for servant-0.10
+- Fix test with hspec-wai-0.8
+
 0.8.1.1
 -------
 
diff --git a/servant-mock.cabal b/servant-mock.cabal
--- a/servant-mock.cabal
+++ b/servant-mock.cabal
@@ -1,5 +1,5 @@
 name:                servant-mock
-version:             0.8.1.1
+version:             0.8.1.2
 synopsis:            Derive a mock server for free from your servant API types
 description:
   Derive a mock server for free from your servant API types
@@ -11,7 +11,7 @@
 author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 copyright:           2015-2016 Servant Contributors
-category:            Web
+category:            Servant, Web
 build-type:          Simple
 extra-source-files:  README.md CHANGELOG.md include/*.h
 cabal-version:       >=1.10
@@ -33,8 +33,8 @@
     base            >=4.7    && <5,
     bytestring      >=0.10.4 && <0.11,
     http-types      >=0.8    && <0.10,
-    servant         >=0.8    && <0.10,
-    servant-server  >=0.8    && <0.10,
+    servant         >=0.8    && <0.11,
+    servant-server  >=0.8    && <0.11,
     transformers    >=0.3    && <0.6,
     QuickCheck      >=2.7    && <2.10,
     wai             >=3.0    && <3.3
@@ -51,7 +51,7 @@
     aeson,
     base,
     servant-mock,
-    servant-server,
+    servant-server >= 0.10,
     QuickCheck,
     warp
   if flag(example)
@@ -72,7 +72,7 @@
     bytestring-conversion,
     base,
     hspec,
-    hspec-wai,
+    hspec-wai >=0.8 && <0.9,
     QuickCheck,
     servant,
     servant-server,
diff --git a/test/Servant/MockSpec.hs b/test/Servant/MockSpec.hs
--- a/test/Servant/MockSpec.hs
+++ b/test/Servant/MockSpec.hs
@@ -13,7 +13,7 @@
 import           Network.Wai
 import           Servant.API
 import           Test.Hspec hiding (pending)
-import           Test.Hspec.Wai
+import           Test.Hspec.Wai hiding (Body)
 import           Test.QuickCheck
 
 import           Servant
@@ -64,7 +64,10 @@
       with (return app) $ do
         it "serves arbitrary response bodies" $ do
           get "/" `shouldRespondWith` 200{
-            matchBody = Just $ Aeson.encode ArbitraryBody
+            matchBody = MatchBody $ \ _ b ->
+              if b == Aeson.encode ArbitraryBody
+                then Nothing
+                else Just ("body not correct\n")
           }
 
     context "response headers" $ do
@@ -77,8 +80,8 @@
       with (toApp withHeader) $ do
         it "serves arbitrary response bodies" $ do
           get "/" `shouldRespondWith` 200{
-            matchHeaders = return $ MatchHeader $ \ h ->
-             if h == [("Content-Type", "application/json"), ("foo", "ArbitraryHeader")]
+            matchHeaders = return $ MatchHeader $ \ h _ ->
+             if h == [("Content-Type", "application/json;charset=utf-8"), ("foo", "ArbitraryHeader")]
                 then Nothing
                 else Just ("headers not correct\n")
           }
@@ -86,8 +89,8 @@
       with (toApp withoutHeader) $ do
         it "works for no additional headers" $ do
           get "/" `shouldRespondWith` 200{
-            matchHeaders = return $ MatchHeader $ \ h ->
-             if h == [("Content-Type", "application/json")]
+            matchHeaders = return $ MatchHeader $ \ h _ ->
+             if h == [("Content-Type", "application/json;charset=utf-8")]
                 then Nothing
                 else Just ("headers not correct\n")
           }