diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.8.6
+-----
+
+- Support for servant-0.17
+
 0.8.5
 -----
 
diff --git a/servant-mock.cabal b/servant-mock.cabal
--- a/servant-mock.cabal
+++ b/servant-mock.cabal
@@ -1,6 +1,6 @@
 cabal-version:       >=1.10
 name:                servant-mock
-version:             0.8.5
+version:             0.8.6
 
 synopsis:            Derive a mock server for free from your servant API types
 category:            Servant, Web, Testing
@@ -21,7 +21,8 @@
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.1
+   || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:  README.md CHANGELOG.md include/*.h
 
@@ -38,14 +39,14 @@
   exposed-modules:
     Servant.Mock
   build-depends:
-    base            >=4.9      && <4.13,
-    base-compat     >=0.10.5   && <0.11,
+    base            >=4.9      && <4.14,
+    base-compat     >=0.10.5   && <0.12,
     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,
+    servant         >=0.17     && <0.18,
+    servant-server  >=0.17     && <0.18,
     transformers    >=0.5.2.0  && <0.6,
-    QuickCheck      >=2.12.6.1 && <2.13,
+    QuickCheck      >=2.12.6.1 && <2.14,
     wai             >=3.2.1.2  && <3.3
   hs-source-dirs:      src
   default-language:    Haskell2010
@@ -83,7 +84,7 @@
     bytestring-conversion,
     base,
     hspec,
-    hspec-wai >=0.9.0 && <0.10,
+    hspec-wai >=0.9.0 && <0.11,
     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
@@ -114,7 +114,7 @@
 instance (KnownSymbol path, HasMock rest context) => HasMock (path :> rest) context where
   mock _ = mock (Proxy :: Proxy rest)
 
-instance (KnownSymbol s, FromHttpApiData a, HasMock rest context) => HasMock (Capture' mods s a :> rest) context where
+instance (KnownSymbol s, FromHttpApiData a, HasMock rest context, SBoolI (FoldLenient mods)) => HasMock (Capture' mods s a :> rest) context where
   mock _ context = \_ -> mock (Proxy :: Proxy rest) context
 
 instance (KnownSymbol s, FromHttpApiData a, HasMock rest context) => HasMock (CaptureAll s a :> rest) context where
@@ -158,6 +158,9 @@
 
 instance (Arbitrary a, KnownNat status, ReflectMethod method, AllCTRender ctypes a)
     => HasMock (Verb method status ctypes a) context where
+  mock _ _ = mockArbitrary
+
+instance (ReflectMethod method) => HasMock (NoContentVerb method) context where
   mock _ _ = mockArbitrary
 
 instance (Arbitrary a, KnownNat status, ReflectMethod method, MimeRender ctype chunk, FramingRender fr, ToSourceIO chunk a)