diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 1.6.0.1
+
+* Make test suite build with GHC 8.6 [#1561](https://github.com/yesodweb/yesod/pull/1561)
+
 ## 1.6.0
 
 * Upgrade to yesod-core 1.6.0
diff --git a/test/EmbedProductionTest.hs b/test/EmbedProductionTest.hs
--- a/test/EmbedProductionTest.hs
+++ b/test/EmbedProductionTest.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TemplateHaskell, QuasiQuotes, TypeFamilies, OverloadedStrings #-}
+{-# LANGUAGE LambdaCase #-}
 module EmbedProductionTest where
 
 -- Tests the production mode of the embedded static subsite by
@@ -108,7 +109,9 @@
         yit "Embedded Javascript" $ do
             get HomeR
             statusIs 200
-            [script] <- htmlQuery "script"
+            script <- htmlQuery "script" >>= \case
+                [s] -> return s
+                _ -> liftIO $ fail "Expected singleton list of script"
             let src = BL.takeWhile (/= 34) $ BL.drop 1 $ BL.dropWhile (/= 34) script -- 34 is "
 
             get $ TL.toStrict $ TL.decodeUtf8 src
diff --git a/yesod-static.cabal b/yesod-static.cabal
--- a/yesod-static.cabal
+++ b/yesod-static.cabal
@@ -1,5 +1,5 @@
 name:            yesod-static
-version:         1.6.0
+version:         1.6.0.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -27,39 +27,34 @@
 
 library
     build-depends:   base                  >= 4        && < 5
-                   , containers            >= 0.2
-                   , old-time              >= 1.0
-                   , yesod-core            >= 1.6      && < 1.7
+                   , async
+                   , attoparsec            >= 0.10
                    , base64-bytestring     >= 0.1.0.1
-                   , byteable              >= 0.1
+                   , blaze-builder         >= 0.3
                    , bytestring            >= 0.9.1.4
-                   , template-haskell
+                   , conduit               >= 1.3
+                   , containers            >= 0.2
+                   , cryptonite            >= 0.11
+                   , cryptonite-conduit    >= 0.1
+                   , css-text              >= 0.1.2
+                   , data-default
                    , directory             >= 1.0
-                   , transformers          >= 0.2.2
-                   , wai-app-static        >= 3.1
-                   , wai                   >= 1.3
-                   , text                  >= 0.9
                    , file-embed            >= 0.0.4.1  && < 0.5
+                   , filepath              >= 1.3
+                   , hashable              >= 1.1
+                   , hjsmin
                    , http-types            >= 0.7
-                   , unix-compat           >= 0.2
-                   , conduit               >= 1.3
-                   , cryptonite-conduit    >= 0.1
-                   , cryptonite            >= 0.11
                    , memory
-                   , data-default
                    , mime-types            >= 0.1
-                   , hjsmin
-                   , filepath              >= 1.3
-                   , resourcet             >= 0.4
-                   , unordered-containers  >= 0.2
                    , process
-                   , async
-
-                   , attoparsec            >= 0.10
-                   , blaze-builder         >= 0.3
-                   , css-text              >= 0.1.2
-                   , hashable              >= 1.1
-                   , exceptions
+                   , template-haskell
+                   , text                  >= 0.9
+                   , transformers          >= 0.2.2
+                   , unix-compat           >= 0.2
+                   , unordered-containers  >= 0.2
+                   , wai                   >= 1.3
+                   , wai-app-static        >= 3.1
+                   , yesod-core            >= 1.6      && < 1.7
 
     exposed-modules: Yesod.Static
                      Yesod.EmbeddedStatic
@@ -96,34 +91,30 @@
                    , HUnit
 
                    -- copy from above
-                   , containers
-                   , old-time
-                   , yesod-core
+                   , async
                    , base64-bytestring
                    , bytestring
-                   , byteable
-                   , template-haskell
+                   , conduit
+                   , containers
+                   , cryptonite
+                   , cryptonite-conduit
+                   , data-default
                    , directory
-                   , transformers
-                   , wai-app-static
-                   , wai
-                   , text
                    , file-embed
+                   , filepath
+                   , hjsmin
                    , http-types
-                   , unix-compat
-                   , conduit
-                   , cryptonite-conduit
-                   , cryptonite
                    , memory
-                   , data-default
                    , mime-types
-                   , hjsmin
-                   , filepath
-                   , resourcet
-                   , unordered-containers
-                   , async
                    , process
-                   , exceptions
+                   , template-haskell
+                   , text
+                   , transformers
+                   , unix-compat
+                   , unordered-containers
+                   , wai
+                   , wai-app-static
+                   , yesod-core
 
     ghc-options:     -Wall -threaded
     extensions: TemplateHaskell