diff --git a/snap-core.cabal b/snap-core.cabal
--- a/snap-core.cabal
+++ b/snap-core.cabal
@@ -1,5 +1,5 @@
 name:           snap-core
-version:        0.9.6.4
+version:        0.9.7.0
 synopsis:       Snap: A Haskell Web Framework (core interfaces and types)
 
 description:
@@ -132,7 +132,7 @@
     attoparsec                >= 0.10    && < 0.13,
     attoparsec-enumerator     >= 0.3     && < 0.4,
     base                      >= 4       && < 5,
-    blaze-builder             >= 0.2.1.4 && < 0.4,
+    blaze-builder             >= 0.2.1.4 && < 0.5,
     blaze-builder-enumerator  >= 0.2     && < 0.3,
     bytestring                >= 0.9     && < 0.11,
     case-insensitive          >= 0.3     && < 1.3,
diff --git a/test/snap-core-testsuite.cabal b/test/snap-core-testsuite.cabal
--- a/test/snap-core-testsuite.cabal
+++ b/test/snap-core-testsuite.cabal
@@ -26,7 +26,7 @@
     attoparsec                 >= 0.10     && <0.13,
     attoparsec-enumerator      >= 0.3,
     base                       >= 4        && <5,
-    blaze-builder              >= 0.2.1.4  && <0.4,
+    blaze-builder              >= 0.2.1.4  && <0.5,
     blaze-builder-enumerator   >= 0.2      && <0.3,
     bytestring,
     case-insensitive           >= 0.3      && <1.3,
diff --git a/test/suite/Snap/Core/Tests.hs b/test/suite/Snap/Core/Tests.hs
--- a/test/suite/Snap/Core/Tests.hs
+++ b/test/suite/Snap/Core/Tests.hs
@@ -10,37 +10,39 @@
 import           Control.Applicative
 import           Control.Concurrent.MVar
 import           Control.DeepSeq
-import           Control.Exception (ErrorCall(..), SomeException, throwIO)
+import           Control.Exception                    (ErrorCall (..),
+                                                       SomeException, throwIO)
 import           Control.Monad
 import           Control.Monad.CatchIO
-import           Control.Monad.Trans (liftIO)
+import           Control.Monad.Trans                  (liftIO)
 import           Control.Parallel.Strategies
-import           Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as S
-import qualified Data.ByteString.Lazy.Char8 as L
-import qualified Data.IntMap as IM
+import           Data.ByteString.Char8                (ByteString)
+import qualified Data.ByteString.Char8                as S
+import qualified Data.ByteString.Lazy.Char8           as L
+import qualified Data.IntMap                          as IM
 import           Data.IORef
-import           Data.Maybe (isJust)
+import qualified Data.Map                             as Map
+import           Data.Maybe                           (isJust)
 import           Data.Monoid
-import           Data.Text (Text)
-import qualified Data.Text.Encoding as T
-import           Data.Text.Lazy ()
-import qualified Data.Map as Map
-import           Prelude hiding (catch)
+import           Data.Text                            (Text)
+import qualified Data.Text.Encoding                   as T
+import           Data.Text.Lazy                       ()
+import           Prelude                              hiding (catch)
 import           Test.Framework
 import           Test.Framework.Providers.HUnit
 import           Test.Framework.Providers.QuickCheck2
-import           Test.HUnit hiding (Test, path)
-import           Test.QuickCheck(oneof, variant, elements, Gen, arbitrary)
+import           Test.HUnit                           hiding (Test, path)
+import           Test.QuickCheck                      (Gen, arbitrary, elements,
+                                                       oneof, variant)
 
 import           Snap.Internal.Exceptions
 import           Snap.Internal.Http.Types
 import           Snap.Internal.Parsing
 import           Snap.Internal.Types
 import           Snap.Iteratee
-import qualified Snap.Iteratee as I
+import qualified Snap.Iteratee                        as I
 import           Snap.Test.Common
-import qualified Snap.Types.Headers as H
+import qualified Snap.Types.Headers                   as H
 
 
 tests :: [Test]