diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 4a4c7ac7..64be3d76 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -81,7 +81,6 @@ library
                    , wai-logger            >= 0.0.1
                    , conduit               >= 0.2      && < 0.3
                    , lifted-base           >= 0.1      && < 0.2
-
     exposed-modules: Yesod.Content
                      Yesod.Core
                      Yesod.Dispatch
diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal
index d85fddb8..6d268d1e 100644
--- a/yesod-test/yesod-test.cabal
+++ b/yesod-test/yesod-test.cabal
@@ -13,25 +13,25 @@ homepage:           http://www.yesodweb.com
 description:        Behaviour Oriented integration Testing for Yesod Applications 
 extra-source-files: README.md, LICENSE
 
+flag ghc7
+
 library
-    build-depends:   hxt >= 9.1.5
-                   , parsec >= 3.1.1
-                   , base
-                   , containers
-                   , filepath
-                   , persistent >= 0.6.4
-                   , monad-control >= 0.2
-                   , transformers >= 0.2
-                   , wai-test
-                   , wai >= 0.4
-                   , ascii
-                   , network
-                   , http-types >= 0.6
-                   , hspec >= 0.9
-                   , HUnit >= 1.0
-                   , bytestring
-                   , text
-                   , monads-tf
+    if flag(ghc7)
+        build-depends:   base                  >= 4.3      && < 5
+        cpp-options:     -DGHC7
+    else
+        build-depends:   base                  >= 4        && < 4.3
+    build-depends:   hxt >= 9.1.6
+                   , parsec                    >= 2.1      && < 4
+                   , persistent                >= 0.7      && < 0.8
+                   , transformers              >= 0.2.2    && < 0.3
+                   , wai                       >= 1.0      && < 1.1
+                   , wai-test                  >= 1.0      && < 1.1
+                   , network                   >= 2.2      && < 2.4
+                   , http-types                >= 0.6      && < 0.7
+                   , HUnit                     >= 1.2      && < 1.3
+                   , hspec                     >= 0.9      && < 1.0
+                   , bytestring                >= 0.9
     exposed-modules: Yesod.Test
     ghc-options:  -Wall