diff --git a/Yesod/Content.hs b/Yesod/Content.hs
index b21e0f59..48ffd145 100644
--- a/Yesod/Content.hs
+++ b/Yesod/Content.hs
@@ -245,8 +245,8 @@ propExt s =
 
 caseTypeByExt :: Assertion
 caseTypeByExt = do
-    typeJavascript @=? typeByExt (ext "foo.js")
-    typeHtml @=? typeByExt (ext "foo.html")
+    Just typeJavascript @=? lookup (ext "foo.js") typeByExt
+    Just typeHtml @=? lookup (ext "foo.html") typeByExt
 #endif
 
 -- | Format a 'UTCTime' in W3 format; useful for setting cookies.
diff --git a/Yesod/Json.hs b/Yesod/Json.hs
index 0b78fc06..46b1ba00 100644
--- a/Yesod/Json.hs
+++ b/Yesod/Json.hs
@@ -130,10 +130,10 @@ caseSimpleOutput = do
     let j = do
         jsonMap
             [ ("foo" , jsonList
-                [ jsonScalar $ fromByteString "bar"
-                , jsonScalar $ fromByteString "baz"
+                [ jsonScalar "bar"
+                , jsonScalar "baz"
                 ])
             ]
-    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack (renderHtml $ unJson j)
+    "{\"foo\":[\"bar\",\"baz\"]}" @=? unpack (toLazyByteString $ unJson j)
 
 #endif