diff --git a/yesod-core/Yesod/Shakespeare.hs b/yesod-core/Yesod/Shakespeare.hs
index 061d387a..9e5f92ba 100644
--- a/yesod-core/Yesod/Shakespeare.hs
+++ b/yesod-core/Yesod/Shakespeare.hs
@@ -47,6 +47,8 @@ module Yesod.Shakespeare (
     , lucius
     , CssUrl
     , renderCssUrl
+
+    , module Text.Shakespeare.I18N
 ) where
 
 import           Control.Monad                      (liftM, forM)
diff --git a/yesod-core/test/YesodCoreTest/Auth.hs b/yesod-core/test/YesodCoreTest/Auth.hs
index 393737b9..43f093c2 100644
--- a/yesod-core/test/YesodCoreTest/Auth.hs
+++ b/yesod-core/test/YesodCoreTest/Auth.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies, MultiParamTypeClasses #-}
-module YesodCoreTest.Auth (specs, Widget) where
+module YesodCoreTest.Auth (specs) where
 
 import Yesod.Core
 import Test.Hspec
diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
index ca472ec2..bbd34b23 100644
--- a/yesod-core/test/YesodCoreTest/Cache.hs
+++ b/yesod-core/test/YesodCoreTest/Cache.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-module YesodCoreTest.Cache (cacheTest, Widget) where
+module YesodCoreTest.Cache (cacheTest) where
 
 import Test.Hspec
 
diff --git a/yesod-core/test/YesodCoreTest/CleanPath.hs b/yesod-core/test/YesodCoreTest/CleanPath.hs
index ef100369..b45c1e1c 100644
--- a/yesod-core/test/YesodCoreTest/CleanPath.hs
+++ b/yesod-core/test/YesodCoreTest/CleanPath.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances, ViewPatterns #-}
 {-# LANGUAGE CPP #-}
-module YesodCoreTest.CleanPath (cleanPathTest, Widget) where
+module YesodCoreTest.CleanPath (cleanPathTest) where
 
 import Test.Hspec
 
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index 609c8e60..9d7e950a 100644
--- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -6,6 +6,7 @@ module YesodCoreTest.ErrorHandling
     , Widget
     ) where
 import Yesod.Core
+import Yesod.Core.Widget
 import Test.Hspec
 import Network.Wai
 import Network.Wai.Test
diff --git a/yesod-core/test/YesodCoreTest/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs
index 7c2711d9..fbcb6b7e 100644
--- a/yesod-core/test/YesodCoreTest/Exceptions.hs
+++ b/yesod-core/test/YesodCoreTest/Exceptions.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module YesodCoreTest.Exceptions (exceptionsTest, Widget) where
+module YesodCoreTest.Exceptions (exceptionsTest) where
 
 import Test.Hspec
 
diff --git a/yesod-core/test/YesodCoreTest/JsLoaderSites/Bottom.hs b/yesod-core/test/YesodCoreTest/JsLoaderSites/Bottom.hs
index 58e05624..7938c923 100644
--- a/yesod-core/test/YesodCoreTest/JsLoaderSites/Bottom.hs
+++ b/yesod-core/test/YesodCoreTest/JsLoaderSites/Bottom.hs
@@ -1,9 +1,10 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module YesodCoreTest.JsLoaderSites.Bottom (B(..), Widget) where
+module YesodCoreTest.JsLoaderSites.Bottom (B(..)) where
 
 import Yesod.Core
+import Yesod.Core.Widget
 
 data B = B
 mkYesod "B" [parseRoutes|
diff --git a/yesod-core/test/YesodCoreTest/Json.hs b/yesod-core/test/YesodCoreTest/Json.hs
index 968df40d..167ff463 100644
--- a/yesod-core/test/YesodCoreTest/Json.hs
+++ b/yesod-core/test/YesodCoreTest/Json.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies, MultiParamTypeClasses, ViewPatterns #-}
-module YesodCoreTest.Json (specs, Widget) where
+module YesodCoreTest.Json (specs) where
 
 import Yesod.Core
 import Test.Hspec
diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
index 22ff5363..1c875f91 100644
--- a/yesod-core/test/YesodCoreTest/Links.hs
+++ b/yesod-core/test/YesodCoreTest/Links.hs
@@ -1,11 +1,12 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances, ViewPatterns #-}
-module YesodCoreTest.Links (linksTest, Widget) where
+module YesodCoreTest.Links (linksTest) where
 
 import Test.Hspec
 
 import Yesod.Core
+import Yesod.Core.Widget
 import Text.Hamlet
 import Network.Wai
 import Network.Wai.Test
diff --git a/yesod-core/test/YesodCoreTest/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs
index 3b2ac9c5..29e52aa1 100644
--- a/yesod-core/test/YesodCoreTest/Media.hs
+++ b/yesod-core/test/YesodCoreTest/Media.hs
@@ -6,6 +6,7 @@ module YesodCoreTest.Media (mediaTest, Widget) where
 
 import Test.Hspec
 import Yesod.Core
+import Yesod.Core.Widget
 import Network.Wai
 import Network.Wai.Test
 import Text.Lucius
diff --git a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
index ec9cfdbb..05db6055 100644
--- a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
+++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
@@ -7,8 +7,11 @@ import Test.Hspec
 import YesodCoreTest.NoOverloadedStringsSub
 
 import Yesod.Core
+import Yesod.Core.Widget
+import Yesod.Shakespeare
 import Network.Wai
 import Network.Wai.Test
+import Network.Wai (pathInfo)
 import Data.Monoid (mempty)
 import qualified Data.Text as T
 import qualified Data.ByteString.Lazy.Char8 as L8
@@ -48,10 +51,8 @@ mkYesod "Y" [parseRoutes|
 
 instance Yesod Y
 
-getRootR :: Handler ()
+getRootR, getFooR :: Handler ()
 getRootR = return ()
-
-getFooR :: Handler ()
 getFooR = return ()
 
 runner :: Session () -> IO ()
@@ -88,7 +89,7 @@ case_deflayoutT = runner $ do
 
 noOverloadedTest :: Spec
 noOverloadedTest = describe "Test.NoOverloadedStrings" $ do
-      it "sanity" case_sanity
-      it "subsite" case_subsite
-      it "deflayout" case_deflayout
-      it "deflayoutT" case_deflayoutT
+    it "sanity" case_sanity
+    it "subsite" case_subsite
+    it "deflayout" case_deflayout
+    it "deflayoutT" case_deflayoutT
diff --git a/yesod-core/test/YesodCoreTest/RawResponse.hs b/yesod-core/test/YesodCoreTest/RawResponse.hs
index e4977afb..cb4b5db5 100644
--- a/yesod-core/test/YesodCoreTest/RawResponse.hs
+++ b/yesod-core/test/YesodCoreTest/RawResponse.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies, MultiParamTypeClasses, ScopedTypeVariables #-}
-module YesodCoreTest.RawResponse (specs, Widget) where
+module YesodCoreTest.RawResponse (specs) where
 
 import Yesod.Core
 import Test.Hspec
diff --git a/yesod-core/test/YesodCoreTest/Redirect.hs b/yesod-core/test/YesodCoreTest/Redirect.hs
index 4df457db..5f1c2b19 100644
--- a/yesod-core/test/YesodCoreTest/Redirect.hs
+++ b/yesod-core/test/YesodCoreTest/Redirect.hs
@@ -1,5 +1,7 @@
-{-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies, MultiParamTypeClasses, OverloadedStrings #-}
-module YesodCoreTest.Redirect (specs, Widget) where
+{-# LANGUAGE QuasiQuotes, TemplateHaskell #-}
+{-# LANGUAGE TypeFamilies, MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedStrings #-}
+module YesodCoreTest.Redirect (specs) where
 
 import YesodCoreTest.YesodTest
 import Yesod.Core.Handler (redirectWith, setEtag)
diff --git a/yesod-core/test/YesodCoreTest/Reps.hs b/yesod-core/test/YesodCoreTest/Reps.hs
index 33bc0c54..74457304 100644
--- a/yesod-core/test/YesodCoreTest/Reps.hs
+++ b/yesod-core/test/YesodCoreTest/Reps.hs
@@ -1,5 +1,6 @@
-{-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies, MultiParamTypeClasses, ViewPatterns #-}
-module YesodCoreTest.Reps (specs, Widget) where
+{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
+{-# LANGUAGE TypeFamilies, MultiParamTypeClasses, ViewPatterns, OverloadedStrings #-}
+module YesodCoreTest.Reps (specs) where
 
 import Yesod.Core
 import Test.Hspec
diff --git a/yesod-core/test/YesodCoreTest/RequestBodySize.hs b/yesod-core/test/YesodCoreTest/RequestBodySize.hs
index 42fa767b..b24212b1 100644
--- a/yesod-core/test/YesodCoreTest/RequestBodySize.hs
+++ b/yesod-core/test/YesodCoreTest/RequestBodySize.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell, MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleInstances #-}
-module YesodCoreTest.RequestBodySize (specs, Widget) where
+module YesodCoreTest.RequestBodySize (specs) where
 
 import Test.Hspec
 
diff --git a/yesod-core/test/YesodCoreTest/StubSslOnly.hs b/yesod-core/test/YesodCoreTest/StubSslOnly.hs
index 3ee24fd2..1b242ea0 100644
--- a/yesod-core/test/YesodCoreTest/StubSslOnly.hs
+++ b/yesod-core/test/YesodCoreTest/StubSslOnly.hs
@@ -2,6 +2,7 @@
 module YesodCoreTest.StubSslOnly ( App ( App ) ) where
 
 import Yesod.Core
+import Yesod.Shakespeare
 import qualified Web.ClientSession                  as CS
 
 data App = App
diff --git a/yesod-core/test/YesodCoreTest/StubUnsecured.hs b/yesod-core/test/YesodCoreTest/StubUnsecured.hs
index 44367dae..d6d195b6 100644
--- a/yesod-core/test/YesodCoreTest/StubUnsecured.hs
+++ b/yesod-core/test/YesodCoreTest/StubUnsecured.hs
@@ -2,6 +2,7 @@
 module YesodCoreTest.StubUnsecured ( App ( App ) ) where
 
 import Yesod.Core
+import Yesod.Shakespeare
 
 data App = App
 
diff --git a/yesod-core/test/YesodCoreTest/WaiSubsite.hs b/yesod-core/test/YesodCoreTest/WaiSubsite.hs
index b319b9e3..090e39f3 100644
--- a/yesod-core/test/YesodCoreTest/WaiSubsite.hs
+++ b/yesod-core/test/YesodCoreTest/WaiSubsite.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP, QuasiQuotes, TemplateHaskell, TypeFamilies, MultiParamTypeClasses, OverloadedStrings #-}
-module YesodCoreTest.WaiSubsite (specs, Widget) where
+module YesodCoreTest.WaiSubsite (specs) where
 
 import YesodCoreTest.YesodTest
 import Yesod.Core
diff --git a/yesod-core/test/YesodCoreTest/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs
index f3c0717e..d1355f30 100644
--- a/yesod-core/test/YesodCoreTest/Widget.hs
+++ b/yesod-core/test/YesodCoreTest/Widget.hs
@@ -6,6 +6,8 @@ module YesodCoreTest.Widget (widgetTest) where
 import Test.Hspec
 
 import Yesod.Core
+import Yesod.Core.Widget
+import Yesod.Shakespeare
 import Text.Julius
 import Text.Lucius
 import Text.Hamlet
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 1dc8f934..fc496172 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -164,7 +164,7 @@ test-suite tests
                   , wai-extra
                   , mwc-random
                   , cookie >= 0.4.1    && < 0.5
-    ghc-options:     -Wall
+    ghc-options: -Wall -fno-warn-unused-binds
     extensions: TemplateHaskell
 
 benchmark widgets