diff --git a/Network/Wai/Test.hs b/Network/Wai/Test.hs
--- a/Network/Wai/Test.hs
+++ b/Network/Wai/Test.hs
@@ -99,18 +99,12 @@
 
 runResponse :: Response -> C.ResourceT IO SResponse
 runResponse res = do
-    bss <- fmap2 toBuilder body C.$= builderToByteString C.$$ CL.consume
+    bss <- C.mapOutput toBuilder body C.$= builderToByteString C.$$ CL.consume
     return $ SResponse s h $ L.fromChunks bss
   where
     (s, h, body) = responseSource res
     toBuilder (C.Chunk builder) = builder
     toBuilder C.Flush = flush
-
-fmap2 :: Functor m => (a -> b) -> C.Source m a -> C.Source m b
-fmap2 f (C.HaveOutput p c o) = C.HaveOutput (fmap2 f p) c (f o)
-fmap2 f (C.NeedInput p c) = C.NeedInput (fmap2 f . p) (fmap2 f c)
-fmap2 _ (C.Done i r) = C.Done i r
-fmap2 f (C.PipeM mp c) = C.PipeM (fmap (fmap2 f) mp) c
 
 assertBool :: String -> Bool -> Session ()
 assertBool s b = liftIO $ H.assertBool s b
diff --git a/wai-test.cabal b/wai-test.cabal
--- a/wai-test.cabal
+++ b/wai-test.cabal
@@ -1,5 +1,5 @@
 name:            wai-test
-version:         1.2.0.2
+version:         1.3.0
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -14,17 +14,17 @@
 
 library
     build-depends:   base                      >= 4        && < 5
-                   , wai                       >= 1.2      && < 1.3
+                   , wai                       >= 1.3      && < 1.4
                    , bytestring                >= 0.9.1.4
                    , text                      >= 0.7      && < 0.12
                    , blaze-builder             >= 0.2.1.4  && < 0.4
                    , transformers              >= 0.2.2    && < 0.4
                    , containers                >= 0.2
-                   , conduit                   >= 0.4      && < 0.5
-                   , blaze-builder-conduit     >= 0.4      && < 0.5
+                   , conduit                   >= 0.5      && < 0.6
+                   , blaze-builder-conduit     >= 0.5      && < 0.6
                    , cookie                    >= 0.2      && < 0.5
                    , HUnit                     >= 1.2      && < 1.3
-                   , http-types                >= 0.6      && < 0.7
+                   , http-types                >= 0.7      && < 0.8
                    , case-insensitive          >= 0.2
     exposed-modules: Network.Wai.Test
     ghc-options:     -Wall