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.2
+version:         2.1.2.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -60,8 +60,9 @@
                  , case-insensitive
                  , lifted-base
                  , network
-                 , wai >= 2.0 && < 2.2
-                 , warp >= 2.0 && < 2.2
+                 , wai >= 3.0 && < 3.1
+                 , warp >= 3.0 && < 3.1
+                 , wai-conduit
                  , http-types
                  , cookie
                  , network-conduit >= 0.6
diff --git a/test/main.hs b/test/main.hs
--- a/test/main.hs
+++ b/test/main.hs
@@ -7,6 +7,7 @@
 import qualified Data.ByteString.Lazy.Char8 as L8
 import Test.HUnit
 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)
 import Network.HTTP.Conduit hiding (port)
@@ -72,7 +73,7 @@
 cookie_jar :: CookieJar
 cookie_jar = createCookieJar [cookie]
 
-app :: Application
+app :: Wai.Request -> IO Wai.Response
 app req =
     case pathInfo req of
         [] ->
@@ -112,10 +113,10 @@
             sClose socket
             return port
 
-withApp :: Application -> (Int -> IO ()) -> IO ()
+withApp :: (Wai.Request -> IO Wai.Response) -> (Int -> IO ()) -> IO ()
 withApp app' f = withApp' (const app') f
 
-withApp' :: (Int -> Application) -> (Int -> IO ()) -> IO ()
+withApp' :: (Int -> Wai.Request -> IO Wai.Response) -> (Int -> IO ()) -> IO ()
 withApp' app' f = do
     port <- getPort
     baton <- newEmptyMVar
@@ -123,14 +124,18 @@
         (forkIO $ runSettings defaultSettings
             { settingsPort = port
             , settingsBeforeMainLoop = putMVar baton ()
-            } (app' port) `onException` putMVar baton ())
+            } (app'' port) `onException` putMVar baton ())
         killThread
         (const $ takeMVar baton >> f port)
+  where
+    app'' port req sendResponse = do
+        res <- app' port req
+        sendResponse res
 
-withAppTls :: Application -> (Int -> IO ()) -> IO ()
+withAppTls :: (Wai.Request -> IO Wai.Response) -> (Int -> IO ()) -> IO ()
 withAppTls app' f = withAppTls' (const app') f
 
-withAppTls' :: (Int -> Application) -> (Int -> IO ()) -> IO ()
+withAppTls' :: (Int -> Wai.Request -> IO Wai.Response) -> (Int -> IO ()) -> IO ()
 withAppTls' app' f = do
     port <- getPort
     baton <- newEmptyMVar
@@ -138,9 +143,13 @@
         (forkIO $ WT.runTLS WT.defaultTlsSettings defaultSettings
             { settingsPort = port
             , settingsBeforeMainLoop = putMVar baton ()
-            } (app' port) `onException` putMVar baton ())
+            } (app'' port) `onException` putMVar baton ())
         killThread
         (const $ takeMVar baton >> f port)
+  where
+    app'' port req sendResponse = do
+        res <- app' port req
+        sendResponse res
 
 main :: IO ()
 main = withSocketsDo $ do
@@ -471,7 +480,7 @@
 
 echo :: (Int -> IO ()) -> IO ()
 echo = withApp $ \req -> do
-    bss <- Wai.requestBody req $$ CL.consume
+    bss <- sourceRequestBody req $$ CL.consume
     return $ responseLBS status200 [] $ L.fromChunks bss
 
 noStatusMessage :: (Int -> IO ()) -> IO ()