diff --git a/src/Network/WebSockets/Handshake/Http.hs b/src/Network/WebSockets/Handshake/Http.hs
--- a/src/Network/WebSockets/Handshake/Http.hs
+++ b/src/Network/WebSockets/Handshake/Http.hs
@@ -141,7 +141,7 @@
     header = (,)
         <$> (CI.mk <$> A.takeWhile1 (/= c2w ':'))
         <*  A.string ": "
-        <*> A.takeWhile1 (/= c2w '\r')
+        <*> A.takeWhile (/= c2w '\r')
         <*  newline
 
 -- | Encode an HTTP upgrade response
@@ -189,7 +189,7 @@
     header = (,)
         <$> (CI.mk <$> A.takeWhile1 (/= c2w ':'))
         <*  A.string ": "
-        <*> A.takeWhile1 (/= c2w '\r')
+        <*> A.takeWhile (/= c2w '\r')
         <*  newline
 
 getRequestHeader :: Monad m
diff --git a/tests/haskell/TestSuite.hs b/tests/haskell/TestSuite.hs
--- a/tests/haskell/TestSuite.hs
+++ b/tests/haskell/TestSuite.hs
@@ -1,12 +1,14 @@
 import Test.Framework (defaultMain)
 
 import qualified Network.WebSockets.Tests
+import qualified Network.WebSockets.Handshake.Http.Tests
 import qualified Network.WebSockets.Handshake.Tests
 import qualified Network.WebSockets.Socket.Tests
 
 main :: IO ()
 main = defaultMain
     [ Network.WebSockets.Tests.tests
+    , Network.WebSockets.Handshake.Http.Tests.tests
     , Network.WebSockets.Handshake.Tests.tests
     , Network.WebSockets.Socket.Tests.tests
     ]
diff --git a/websockets.cabal b/websockets.cabal
--- a/websockets.cabal
+++ b/websockets.cabal
@@ -1,5 +1,5 @@
 Name:    websockets
-Version: 0.7.0.1
+Version: 0.7.1.0
 
 Synopsis:
   A sensible and clean way to write WebSocket-capable servers in Haskell.