diff --git a/.travis.yml b/.travis.yml
index 929b0b13..d6854b8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,9 @@ sudo: false
 language: c
 
 env:
-  - GHCVER=7.8.4
-  - GHCVER=7.10.2
+  - GHCVER=7.8.4 CABALVER=1.22
+  - GHCVER=7.10.3 CABALVER=1.22
+  - GHCVER=8.0.1 CABALVER=1.24
 
 addons:
   apt:
@@ -12,13 +13,15 @@ addons:
       - hvr-ghc
     packages:
       - ghc-7.8.4
-      - ghc-7.10.2
+      - ghc-7.10.3
+      - ghc-8.0.1
       - cabal-install-1.22
+      - cabal-install-1.24
       - libgmp-dev
 
 install:
   - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
-  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
+  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
   - ghc --version
   - cabal --version
   - travis_retry cabal update
diff --git a/servant-mock/servant-mock.cabal b/servant-mock/servant-mock.cabal
index fd816ebe..8e750d69 100644
--- a/servant-mock/servant-mock.cabal
+++ b/servant-mock/servant-mock.cabal
@@ -29,7 +29,7 @@ library
     http-types >= 0.8 && <0.10,
     servant == 0.7.*,
     servant-server == 0.7.*,
-    transformers >= 0.3 && <0.5,
+    transformers >= 0.3 && <0.6,
     QuickCheck >= 2.7 && <2.9,
     wai >= 3.0 && <3.3
   hs-source-dirs:      src
diff --git a/servant/servant.cabal b/servant/servant.cabal
index 3c35a5da..4f0e5579 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -49,7 +49,7 @@ library
     Servant.Utils.Links
     Servant.Utils.Enter
   build-depends:
-      base >= 4.7 && < 4.9
+      base >= 4.7 && < 4.10
     , base-compat >= 0.9
     , aeson >= 0.7
     , attoparsec >= 0.12