diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
index 3553b1e2..30dcfaaa 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 hiding (Session)
+import Yesod.Core
 
 data C = C
 
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index 64a978f8..40038082 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 hiding (Session)
+import Yesod.Core
 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 356bf0a0..93368b7a 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, Session)
+import Yesod.Core hiding (Request)
 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 a8b6261c..676e0f1d 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, Session)
+import Yesod.Core hiding (Request)
 import Network.Wai.Test
 
 data H = H
diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
index 237899bc..34b5dc4c 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, Session)
+import Yesod.Core hiding (Request)
 import Text.Hamlet
 import Network.Wai.Test
 
diff --git a/yesod-core/test/YesodCoreTest/Media.hs b/yesod-core/test/YesodCoreTest/Media.hs
index 9922b402..7ce98286 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, Session)
+import Yesod.Core hiding (Request)
 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 98c538d7..b32e6d65 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, Session)
+import Yesod.Core hiding (Request)
 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 6fcb38d2..baf66979 100644
--- a/yesod-core/test/YesodCoreTest/WaiSubsite.hs
+++ b/yesod-core/test/YesodCoreTest/WaiSubsite.hs
@@ -2,8 +2,9 @@
 module YesodCoreTest.WaiSubsite (specs, Widget) where
 
 import YesodCoreTest.YesodTest
-import Yesod.Core hiding (Session)
+import Yesod.Core
 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 5ba4bfd3..f102136e 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, Session)
+import Yesod.Core hiding (Request)
 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 07585554..46040f84 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 (Session, Request)
+import Yesod.Core hiding (Request)
 import Network.Wai.Test
 import Network.Wai
 import Test.Hspec