diff --git a/yesod-persistent/ChangeLog.md b/yesod-persistent/ChangeLog.md
index 7c2a3b19..3ba8a38e 100644
--- a/yesod-persistent/ChangeLog.md
+++ b/yesod-persistent/ChangeLog.md
@@ -1,5 +1,11 @@
 # ChangeLog for yesod-persistent
 
+## 1.6.0.4
+
+* Fix test suite to be compatible with latest `persistent-template`
+* See https://github.com/yesodweb/persistent/pull/1002
+* [#1649](https://github.com/yesodweb/yesod/pull/1649/files)
+
 ## 1.6.0.3
 
 * Replace call to `connPrepare` with `getStmtConn`. [#1635](https://github.com/yesodweb/yesod/issues/1635)
diff --git a/yesod-persistent/test/Yesod/PersistSpec.hs b/yesod-persistent/test/Yesod/PersistSpec.hs
index 6f589af4..6164d0d6 100644
--- a/yesod-persistent/test/Yesod/PersistSpec.hs
+++ b/yesod-persistent/test/Yesod/PersistSpec.hs
@@ -4,6 +4,8 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE StandaloneDeriving #-}
 module Yesod.PersistSpec where
 
 import Test.Hspec
diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal
index c46d444a..492bbefb 100644
--- a/yesod-persistent/yesod-persistent.cabal
+++ b/yesod-persistent/yesod-persistent.cabal
@@ -1,5 +1,5 @@
 name:            yesod-persistent
-version:         1.6.0.3
+version:         1.6.0.4
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -17,7 +17,7 @@ library
     build-depends:   base                      >= 4        && < 5
                    , yesod-core                >= 1.6      && < 1.7
                    , persistent                >= 2.8      && < 2.11
-                   , persistent-template       >= 2.1      && < 2.8
+                   , persistent-template       >= 2.1      && < 2.9
                    , transformers              >= 0.2.2
                    , blaze-builder
                    , conduit