diff --git a/Network/Wai/Application/Classic/RevProxy.hs b/Network/Wai/Application/Classic/RevProxy.hs
--- a/Network/Wai/Application/Classic/RevProxy.hs
+++ b/Network/Wai/Application/Classic/RevProxy.hs
@@ -4,7 +4,6 @@
 
 import Blaze.ByteString.Builder (Builder)
 import Control.Applicative
-import Control.Exception (bracket)
 import Control.Monad
 import Control.Monad.IO.Class (liftIO)
 import Data.ByteString (ByteString)
@@ -14,23 +13,21 @@
 import Data.Default.Class
 import qualified Network.HTTP.Client as H
 import Network.HTTP.Types
-import Network.Wai.Conduit
 import Network.Wai.Application.Classic.Conduit
 import Network.Wai.Application.Classic.EventSource
 import Network.Wai.Application.Classic.Field
 import Network.Wai.Application.Classic.Header
 import Network.Wai.Application.Classic.Path
 import Network.Wai.Application.Classic.Types
+import Network.Wai.Conduit
 
 ----------------------------------------------------------------
 
 -- |  Relaying any requests as reverse proxy.
 
 revProxyApp :: ClassicAppSpec -> RevProxyAppSpec -> RevProxyRoute -> Application
-revProxyApp cspec spec route req respond = bracket setup teardown proxy
+revProxyApp cspec spec route req respond = H.withResponse httpClientRequest mgr proxy
   where
-    setup = H.responseOpen httpClientRequest mgr
-    teardown = H.responseClose
     proxy hrsp = do
         let status     = H.responseStatus hrsp
             hdr        = fixHeader $ H.responseHeaders hrsp
diff --git a/test/Spec.hs b/test/Spec.hs
--- a/test/Spec.hs
+++ b/test/Spec.hs
@@ -24,7 +24,9 @@
 testServer :: IO ()
 testServer = do
     dir <- getCurrentDirectory
-    run 2345 $ testApp dir
+    runSettings settings $ testApp dir
+  where
+    settings = setPort 2345 $ setHost "127.0.0.1" defaultSettings
 
 testApp :: FilePath -> Application
 testApp dir req
diff --git a/wai-app-file-cgi.cabal b/wai-app-file-cgi.cabal
--- a/wai-app-file-cgi.cabal
+++ b/wai-app-file-cgi.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-app-file-cgi
-Version:                3.0.0
+Version:                3.0.1
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3