diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.8.5
+-----
+
+- Support for servant-0.15
+
 0.8.4
 -----
 
diff --git a/servant-mock.cabal b/servant-mock.cabal
--- a/servant-mock.cabal
+++ b/servant-mock.cabal
@@ -1,27 +1,30 @@
+cabal-version:       >=1.10
 name:                servant-mock
-version:             0.8.4
+version:             0.8.5
+
 synopsis:            Derive a mock server for free from your servant API types
+category:            Servant, Web, Testing
 description:
   Derive a mock server for free from your servant API types
   .
   See the @Servant.Mock@ module for the documentation and an example.
+
 homepage:            http://haskell-servant.readthedocs.org/
+bug-reports:         http://github.com/haskell-servant/servant-mock/issues
 license:             BSD3
 license-file:        LICENSE
 author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
-copyright:           2015-2016 Servant Contributors
-category:            Servant, Web
+copyright:           2015-2018 Servant Contributors
 build-type:          Simple
-extra-source-files:  README.md CHANGELOG.md include/*.h
-cabal-version:       >=1.10
-bug-reports:         http://github.com/haskell-servant/servant-mock/issues
 tested-with:
-  GHC==8.2.2,
-  GHC==8.0.2,
-  GHC==7.10.3,
-  GHC==7.8.4
+  GHC ==8.0.2
+   || ==8.2.2
+   || ==8.4.4
+   || ==8.6.1
 
+extra-source-files:  README.md CHANGELOG.md include/*.h
+
 source-repository head
   type: git
   location: http://github.com/haskell-servant/servant-mock.git
@@ -35,15 +38,15 @@
   exposed-modules:
     Servant.Mock
   build-depends:
-    base            >=4.7    && <5,
-    base-compat     >=0.9.3  && <0.10,
-    bytestring      >=0.10.4 && <0.11,
-    http-types      >=0.8    && <0.13,
-    servant         >=0.13   && <0.14,
-    servant-server  >=0.13   && <0.14,
-    transformers    >=0.3    && <0.6,
-    QuickCheck      >=2.7    && <2.12,
-    wai             >=3.0    && <3.3
+    base            >=4.9      && <4.13,
+    base-compat     >=0.10.5   && <0.11,
+    bytestring      >=0.10.8.1 && <0.11,
+    http-types      >=0.12.2   && <0.13,
+    servant         >=0.15     && <0.16,
+    servant-server  >=0.15     && <0.16,
+    transformers    >=0.5.2.0  && <0.6,
+    QuickCheck      >=2.12.6.1 && <2.13,
+    wai             >=3.2.1.2  && <3.3
   hs-source-dirs:      src
   default-language:    Haskell2010
   include-dirs: include
@@ -80,7 +83,7 @@
     bytestring-conversion,
     base,
     hspec,
-    hspec-wai >=0.8 && <0.10,
+    hspec-wai >=0.9.0 && <0.10,
     QuickCheck,
     servant,
     servant-server,
diff --git a/src/Servant/Mock.hs b/src/Servant/Mock.hs
--- a/src/Servant/Mock.hs
+++ b/src/Servant/Mock.hs
@@ -124,6 +124,11 @@
     => HasMock (ReqBody' mods ctypes a :> rest) context where
   mock _ context = \_ -> mock (Proxy :: Proxy rest) context
 
+-- | @since 0.8.5
+instance (MimeUnrender ctype chunk, FramingUnrender fr, FromSourceIO chunk a, HasMock rest context)
+    => HasMock (StreamBody' mods fr ctype a :> rest) context where
+  mock _ context = \_ -> mock (Proxy :: Proxy rest) context
+
 instance HasMock rest context => HasMock (RemoteHost :> rest) context where
   mock _ context = \_ -> mock (Proxy :: Proxy rest) context
 
@@ -153,6 +158,10 @@
 
 instance (Arbitrary a, KnownNat status, ReflectMethod method, AllCTRender ctypes a)
     => HasMock (Verb method status ctypes a) context where
+  mock _ _ = mockArbitrary
+
+instance (Arbitrary a, KnownNat status, ReflectMethod method, MimeRender ctype chunk, FramingRender fr, ToSourceIO chunk a)
+    => HasMock (Stream method status fr ctype a) context where
   mock _ _ = mockArbitrary
 
 instance OVERLAPPING_
diff --git a/test/Servant/MockSpec.hs b/test/Servant/MockSpec.hs
--- a/test/Servant/MockSpec.hs
+++ b/test/Servant/MockSpec.hs
@@ -5,9 +5,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeOperators #-}
-#if __GLASGOW_HASKELL__ == 708
-{-# OPTIONS_GHC -fcontext-stack=31 #-}
-#endif
 
 module Servant.MockSpec where
 
@@ -21,7 +18,7 @@
 import           Test.QuickCheck
 
 import           Servant
-import           Servant.API.Internal.Test.ComprehensiveAPI
+import           Servant.Test.ComprehensiveAPI
 import           Servant.Mock
 
 import Data.ByteString.Conversion.To