diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 ==========
 
+## Version 1.5.1
+
+* Add support for GHC 8.8
+
 ## Version 1.5.0
 
 * Switch to faster map data type - all previous usage of
diff --git a/minio-hs.cabal b/minio-hs.cabal
--- a/minio-hs.cabal
+++ b/minio-hs.cabal
@@ -1,5 +1,5 @@
 name:                minio-hs
-version:             1.5.0
+version:             1.5.1
 synopsis:            A MinIO Haskell Library for Amazon S3 compatible cloud
                      storage.
 description:         The MinIO Haskell client library provides simple APIs to
diff --git a/src/Network/Minio/Data.hs b/src/Network/Minio/Data.hs
--- a/src/Network/Minio/Data.hs
+++ b/src/Network/Minio/Data.hs
@@ -21,10 +21,9 @@
 module Network.Minio.Data where
 
 import qualified Conduit                      as C
-import           Control.Concurrent.MVar      (MVar)
 import qualified Control.Concurrent.MVar      as M
-import           Control.Monad.IO.Unlift      (MonadUnliftIO, UnliftIO (..),
-                                               askUnliftIO, withUnliftIO)
+import           Control.Monad.IO.Unlift      (UnliftIO (..), askUnliftIO,
+                                               withUnliftIO)
 import           Control.Monad.Trans.Resource
 import qualified Data.Aeson                   as A
 import qualified Data.ByteArray               as BA
diff --git a/src/Network/Minio/Utils.hs b/src/Network/Minio/Utils.hs
--- a/src/Network/Minio/Utils.hs
+++ b/src/Network/Minio/Utils.hs
@@ -26,7 +26,6 @@
 import qualified Data.HashMap.Strict           as H
 import qualified Data.List                     as List
 import qualified Data.Text                     as T
-import           Data.Text.Encoding.Error      (lenientDecode)
 import           Data.Text.Read                (decimal)
 import           Data.Time                     (defaultTimeLocale, parseTimeM,
                                                 rfc822DateFormat)
diff --git a/src/Network/Minio/XmlParser.hs b/src/Network/Minio/XmlParser.hs
--- a/src/Network/Minio/XmlParser.hs
+++ b/src/Network/Minio/XmlParser.hs
@@ -56,10 +56,10 @@
 uncurry6 f (a, b, c, d, e, g) = f a b c d e g
 
 -- | Parse time strings from XML
-parseS3XMLTime :: (MonadIO m) => Text -> m UTCTime
-parseS3XMLTime = either (throwIO . MErrVXmlParse) return
-               . parseTimeM True defaultTimeLocale s3TimeFormat
-               . T.unpack
+parseS3XMLTime :: MonadIO m => Text -> m UTCTime
+parseS3XMLTime t =
+    maybe (throwIO $ MErrVXmlParse $ "timestamp parse failure: " <> t) return $
+    parseTimeM True defaultTimeLocale s3TimeFormat $ T.unpack t
 
 parseDecimal :: (MonadIO m, Integral a) => Text -> m a
 parseDecimal numStr = either (throwIO . MErrVXmlParse . show) return $
diff --git a/stack.yaml b/stack.yaml
--- a/stack.yaml
+++ b/stack.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-13.1
+resolver: lts-14.6
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
diff --git a/test/LiveServer.hs b/test/LiveServer.hs
--- a/test/LiveServer.hs
+++ b/test/LiveServer.hs
@@ -77,6 +77,15 @@
 funTestBucketPrefix :: Text
 funTestBucketPrefix = "miniohstest-"
 
+loadTestServer :: IO ConnectInfo
+loadTestServer = do
+    val <- lookupEnv "MINIO_LOCAL"
+    isSecure <- lookupEnv "MINIO_SECURE"
+    return $ case (val, isSecure) of
+      (Just _, Just _) -> setCreds (Credentials "minio" "minio123") "https://localhost:9000"
+      (Just _, Nothing) -> setCreds (Credentials "minio" "minio123") "http://localhost:9000"
+      (Nothing, _) -> minioPlayCI
+
 funTestWithBucket :: TestName
                   -> (([Char] -> Minio ()) -> Bucket -> Minio ()) -> TestTree
 funTestWithBucket t minioTest = testCaseSteps t $ \step -> do
@@ -84,10 +93,7 @@
   bktSuffix <- liftIO $ generate $ Q.vectorOf 10 (Q.choose ('a', 'z'))
   let b = T.concat [funTestBucketPrefix, T.pack bktSuffix]
       liftStep = liftIO . step
-  connInfo <- ( bool minioPlayCI
-                  ( setCreds (Credentials "minio" "minio123") "http://localhost:9000" )
-                  . isJust
-              ) <$> lookupEnv "MINIO_LOCAL"
+  connInfo <- loadTestServer
   ret <- runMinio connInfo $ do
     liftStep $ "Creating bucket for test - " ++ t
     foundBucket <- bucketExists b