diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
index 30dcfaaa..3553b1e2 100644
--- a/yesod-core/test/YesodCoreTest/Cache.hs
+++ b/yesod-core/test/YesodCoreTest/Cache.hs
@@ -9,7 +9,7 @@ import Test.Hspec.HUnit()
 import Network.Wai
 import Network.Wai.Test
 
-import Yesod.Core
+import Yesod.Core hiding (Session)
 
 data C = C
 
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index 57007ff3..703fb1c3 100644
--- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -3,7 +3,7 @@ module YesodCoreTest.ErrorHandling
     ( errorHandlingTest
     , Widget
     ) where
-import Yesod.Core
+import Yesod.Core hiding (Session)
 import Test.Hspec
 import Test.Hspec.HUnit()
 import Network.Wai
diff --git a/yesod-core/test/YesodCoreTest/Exceptions.hs b/yesod-core/test/YesodCoreTest/Exceptions.hs
index 93368b7a..356bf0a0 100644
--- a/yesod-core/test/YesodCoreTest/Exceptions.hs
+++ b/yesod-core/test/YesodCoreTest/Exceptions.hs
@@ -6,7 +6,7 @@ module YesodCoreTest.Exceptions (exceptionsTest, Widget) where
 import Test.Hspec
 import Test.Hspec.HUnit ()
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 import Network.Wai
 import Network.Wai.Test
 import Network.HTTP.Types (status301)
diff --git a/yesod-core/test/YesodCoreTest/JsLoader.hs b/yesod-core/test/YesodCoreTest/JsLoader.hs
index 676e0f1d..a8b6261c 100644
--- a/yesod-core/test/YesodCoreTest/JsLoader.hs
+++ b/yesod-core/test/YesodCoreTest/JsLoader.hs
@@ -9,7 +9,7 @@ import YesodCoreTest.JsLoaderSites.Bottom (B(..))
 import Test.Hspec
 import Test.Hspec.HUnit ()
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 import Network.Wai.Test
 
 data H = H
diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
index 34b5dc4c..237899bc 100644
--- a/yesod-core/test/YesodCoreTest/Links.hs
+++ b/yesod-core/test/YesodCoreTest/Links.hs
@@ -6,7 +6,7 @@ module YesodCoreTest.Links (linksTest, Widget) where
 import Test.Hspec
 import Test.Hspec.HUnit ()
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 import Text.Hamlet
 import Network.Wai.Test
 
diff --git a/yesod-core/test/YesodCoreTest/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs
index 7ce98286..9922b402 100644
--- a/yesod-core/test/YesodCoreTest/Media.hs
+++ b/yesod-core/test/YesodCoreTest/Media.hs
@@ -6,7 +6,7 @@ module YesodCoreTest.Media (mediaTest, Widget) where
 
 import Test.Hspec
 import Test.Hspec.HUnit ()
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 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 b32e6d65..98c538d7 100644
--- a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
+++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
@@ -5,7 +5,7 @@ module YesodCoreTest.NoOverloadedStrings (noOverloadedTest, Widget) where
 import Test.Hspec
 import Test.Hspec.HUnit ()
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 import Network.Wai.Test
 import Data.Monoid (mempty)
 
diff --git a/yesod-core/test/YesodCoreTest/WaiSubsite.hs b/yesod-core/test/YesodCoreTest/WaiSubsite.hs
index baf66979..6fcb38d2 100644
--- a/yesod-core/test/YesodCoreTest/WaiSubsite.hs
+++ b/yesod-core/test/YesodCoreTest/WaiSubsite.hs
@@ -2,9 +2,8 @@
 module YesodCoreTest.WaiSubsite (specs, Widget) where
 
 import YesodCoreTest.YesodTest
-import Yesod.Core
+import Yesod.Core hiding (Session)
 import qualified Network.HTTP.Types as H
-import Network.Wai
 
 myApp :: Application
 myApp _ = return $ responseLBS H.status200 [("Content-type", "text/plain")] "WAI"
diff --git a/yesod-core/test/YesodCoreTest/Widget.hs b/yesod-core/test/YesodCoreTest/Widget.hs
index f102136e..5ba4bfd3 100644
--- a/yesod-core/test/YesodCoreTest/Widget.hs
+++ b/yesod-core/test/YesodCoreTest/Widget.hs
@@ -6,7 +6,7 @@ module YesodCoreTest.Widget (widgetTest) where
 import Test.Hspec
 import Test.Hspec.HUnit ()
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Request, Session)
 import Text.Julius
 import Text.Lucius
 import Text.Hamlet
diff --git a/yesod-core/test/YesodCoreTest/YesodTest.hs b/yesod-core/test/YesodCoreTest/YesodTest.hs
index 46040f84..07585554 100644
--- a/yesod-core/test/YesodCoreTest/YesodTest.hs
+++ b/yesod-core/test/YesodCoreTest/YesodTest.hs
@@ -9,7 +9,7 @@ module YesodCoreTest.YesodTest
   , module Test.Hspec
 ) where
 
-import Yesod.Core hiding (Request)
+import Yesod.Core hiding (Session, Request)
 import Network.Wai.Test
 import Network.Wai
 import Test.Hspec