diff --git a/http-conduit.cabal b/http-conduit.cabal
--- a/http-conduit.cabal
+++ b/http-conduit.cabal
@@ -1,5 +1,5 @@
 name:            http-conduit
-version:         2.1.7
+version:         2.1.7.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -63,7 +63,7 @@
                  , lifted-base
                  , network
                  , wai >= 3.0 && < 3.1
-                 , warp >= 3.0.0.2 && < 3.1
+                 , warp >= 3.0.0.2 && < 3.2
                  , wai-conduit
                  , http-types
                  , cookie
diff --git a/test/main.hs b/test/main.hs
--- a/test/main.hs
+++ b/test/main.hs
@@ -9,7 +9,7 @@
 import Network.Wai hiding (requestBody)
 import Network.Wai.Conduit (responseSource, sourceRequestBody)
 import qualified Network.Wai as Wai
-import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort, settingsBeforeMainLoop, Settings, setTimeout)
+import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort, setBeforeMainLoop, Settings, setTimeout)
 import Network.HTTP.Conduit hiding (port)
 import qualified Network.HTTP.Conduit as NHC
 import Network.HTTP.Client.MultipartFormData
@@ -127,10 +127,10 @@
     port <- getPort
     baton <- newEmptyMVar
     bracket
-        (forkIO $ runSettings (modSettings defaultSettings
-            { settingsPort = port
-            , settingsBeforeMainLoop = putMVar baton ()
-            }) (app'' port) `onException` putMVar baton ())
+        (forkIO $ runSettings (modSettings $
+            setPort port
+            $ setBeforeMainLoop (putMVar baton ())
+              defaultSettings) (app'' port) `onException` putMVar baton ())
         killThread
         (const $ takeMVar baton >> f port)
   where
@@ -146,10 +146,11 @@
     port <- getPort
     baton <- newEmptyMVar
     bracket
-        (forkIO $ WT.runTLS WT.defaultTlsSettings defaultSettings
-            { settingsPort = port
-            , settingsBeforeMainLoop = putMVar baton ()
-            } (app'' port) `onException` putMVar baton ())
+        (forkIO $ WT.runTLS WT.defaultTlsSettings (
+            setPort port
+            $ setBeforeMainLoop (putMVar baton ())
+              defaultSettings)
+            (app'' port) `onException` putMVar baton ())
         killThread
         (const $ takeMVar baton >> f port)
   where