diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs
index 2704e60c..6472b912 100644
--- a/Yesod/Dispatch.hs
+++ b/Yesod/Dispatch.hs
@@ -396,8 +396,7 @@ propEncDecSession session' = unsafePerformIO $ do
     let expire = addUTCTime 1 now
     let rhost = B.pack "some host"
     let val = encodeSession key expire rhost session'
-    return $ Just session' ==
-             decodeSession key now rhost (B.pack val)
+    return $ Just session' == decodeSession key now rhost val
 
 propGetPutTime :: UTCTime -> Bool
 propGetPutTime t = Right t == runGet getTime (runPut $ putTime t)
diff --git a/Yesod/Json.hs b/Yesod/Json.hs
index 0629f122..4341634e 100644
--- a/Yesod/Json.hs
+++ b/Yesod/Json.hs
@@ -30,7 +30,7 @@ import Text.Hamlet
 import Test.Framework (testGroup, Test)
 import Test.Framework.Providers.HUnit
 import Test.HUnit hiding (Test)
-import Data.Text.Lazy (unpack)
+import Data.ByteString.Lazy.Char8 (unpack)
 import Yesod.Content hiding (testSuite)
 #else
 import Yesod.Content
@@ -128,11 +128,10 @@ caseSimpleOutput = do
     let j = do
         jsonMap
             [ ("foo" , jsonList
-                [ jsonScalar $ Encoded $ pack "bar"
-                , jsonScalar $ Encoded $ pack "baz"
+                [ jsonScalar $ preEscapedString "bar"
+                , jsonScalar $ preEscapedString "baz"
                 ])
             ]
-    t <- hamletToText id $ unJson j
-    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack t
+    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack (renderHtml $ unJson j)
 
 #endif