diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.18
  - GHCVER=7.8.2 CABALVER=1.20
- - GHCVER=head CABALVER=1.20
+ - GHCVER=7.10.1 CABALVER=1.22
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
@@ -20,6 +20,4 @@
  - hlint src
 
 matrix:
-  allow_failures:
-   - env: GHCVER=head CABALVER=1.20
   fast_finish: true
diff --git a/src/Instances/TH/Lift.hs b/src/Instances/TH/Lift.hs
--- a/src/Instances/TH/Lift.hs
+++ b/src/Instances/TH/Lift.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskell, CPP #-}
 module Instances.TH.Lift
   ( -- | This module provides orphan instances for the 'Language.Haskell.TH.Syntax.Lift' class from template-haskell. Following is a list of the provided instances.
     --
@@ -46,14 +46,16 @@
 
   ) where
 
-import Language.Haskell.TH
 import Language.Haskell.TH.Lift
 
 import qualified Data.Foldable as F
 
 -- Base
+#if !MIN_VERSION_template_haskell(2,9,1)
+import Language.Haskell.TH
 import Data.Int
 import Data.Word
+#endif
 
 -- Containers
 import qualified Data.IntMap as IntMap
@@ -79,7 +81,9 @@
 --------------------------------------------------------------------------------
 
 --------------------------------------------------------------------------------
+#if !MIN_VERSION_template_haskell(2,9,1)
 -- Base
+
 instance Lift Word8 where
   lift x = [| fromInteger $(lift $ toInteger x) :: Word8 |]
 
@@ -109,6 +113,8 @@
 
 instance Lift Double where
   lift x = [| $(litE $ rationalL $ toRational x) :: Double |]
+
+# endif
 
 --------------------------------------------------------------------------------
 -- Containers
diff --git a/tests/doctests.hsc b/tests/doctests.hsc
--- a/tests/doctests.hsc
+++ b/tests/doctests.hsc
@@ -21,6 +21,8 @@
 import System.FilePath
 import Test.DocTest
 
+import Prelude
+
 ##ifdef mingw32_HOST_ARCH
 ##ifdef i386_HOST_ARCH
 ##define USE_CP
diff --git a/th-lift-instances.cabal b/th-lift-instances.cabal
--- a/th-lift-instances.cabal
+++ b/th-lift-instances.cabal
@@ -1,5 +1,5 @@
 name:          th-lift-instances
-version:       0.1.4
+version:       0.1.5
 license:       BSD3
 cabal-version: >= 1.10
 license-file:  LICENSE
@@ -53,7 +53,7 @@
     , template-haskell
     , containers >= 0.4 && < 0.6
     , vector >= 0.9 && < 0.11
-    , text >= 0.11 && < 1.2
+    , text >= 0.11 && < 1.3
     , bytestring >= 0.9 && < 0.11
     , th-lift-instances
     , QuickCheck >= 2.6 && < 2.8