diff --git a/.travis.yml b/.travis.yml
index 0b696e7..5acff86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,21 +13,18 @@ before_cache:
 
 matrix:
   include:
-    - env: CABALVER=1.16 GHCVER=7.6.3
-      compiler: ": #GHC 7.6.3"
-      addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
-    - env: CABALVER=1.18 GHCVER=7.8.4
-      compiler: ": #GHC 7.8.4"
-      addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
-    - env: CABALVER=1.22 GHCVER=7.10.2
-      compiler: ": #GHC 7.10.2"
-      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
     - env: CABALVER=1.22 GHCVER=7.10.3
       compiler: ": #GHC 7.10.3"
       addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
-    - env: CABALVER=1.24 GHCVER=8.0.1
-      compiler: ": #GHC 8.0.1"
-      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
+    - env: CABALVER=1.24 GHCVER=8.0.2
+      compiler: ": #GHC 8.0.2"
+      addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
+    - env: CABALVER=2.0 GHCVER=8.2.2
+      compiler: ": #GHC 8.2.2"
+      addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}
+    - env: CABALVER=2.2 GHCVER=8.4.1
+      compiler: ": #GHC 8.4.1"
+      addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.1], sources: [hvr-ghc]}}
     - env: CABALVER=head GHCVER=head
       compiler: ": #GHC head"
       addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
diff --git a/thyme.cabal b/thyme.cabal
index 893de5f..4ff786d 100644
--- a/thyme.cabal
+++ b/thyme.cabal
@@ -53,6 +53,11 @@ flag show-internal
     default: False
     manual: True
 
+flag old-time
+    description: pre-1.5 Time library
+    default: False
+    manual: False
+
 library
     default-language: Haskell2010
     include-dirs: include
@@ -93,14 +98,19 @@ library
         deepseq >= 1.2,
         hashable >= 1.2,
         mtl >= 1.1,
-        old-locale >= 1.0,
         random,
         text >= 0.11,
-        time >= 1.4,
         true-name >= 0.1.0.1,
         vector >= 0.9,
         vector-th-unbox >= 0.2.1.0,
         vector-space >= 0.8
+    if flag(old-time)
+        build-depends:
+            time < 1.5,
+            old-locale >= 1.0
+    else
+        build-depends:
+            time >= 1.5   
     if os(windows)
         build-depends: Win32
     if os(darwin) || os(freebsd)