diff --git a/servant-auth/servant-auth-server/servant-auth-server.cabal b/servant-auth/servant-auth-server/servant-auth-server.cabal
index ff0735b85..dba2d3c18 100644
--- a/servant-auth/servant-auth-server/servant-auth-server.cabal
+++ b/servant-auth/servant-auth-server/servant-auth-server.cabal
@@ -38,7 +38,7 @@ library
     , bytestring              >= 0.11 && < 0.13
     , case-insensitive        >= 1.2.0.11 && < 1.3
     , cookie                  >= 0.4.4    && < 0.6
-    , data-default-class      >= 0.1.2.0  && < 0.2
+    , data-default            >= 0.2      && < 0.9
     , entropy                 >= 0.4.1.3  && < 0.5
     , http-types              >= 0.12.2   && < 0.13
     , jose                    >= 0.10     && < 0.12
diff --git a/servant-auth/servant-auth-server/src/Servant/Auth/Server.hs b/servant-auth/servant-auth-server/src/Servant/Auth/Server.hs
index d163fc26f..9a47f615d 100644
--- a/servant-auth/servant-auth-server/src/Servant/Auth/Server.hs
+++ b/servant-auth/servant-auth-server/src/Servant/Auth/Server.hs
@@ -141,7 +141,7 @@ module Servant.Auth.Server
 
 import Prelude hiding                           (readFile, writeFile)
 import Data.ByteString                          (ByteString, writeFile, readFile)
-import Data.Default.Class                       (Default (def))
+import Data.Default                             (Default (def))
 import Servant.Auth
 import Servant.Auth.JWT
 import Servant.Auth.Server.Internal             ()
diff --git a/servant-auth/servant-auth-server/src/Servant/Auth/Server/Internal/ConfigTypes.hs b/servant-auth/servant-auth-server/src/Servant/Auth/Server/Internal/ConfigTypes.hs
index 61e6f33a4..0ecce7b7a 100644
--- a/servant-auth/servant-auth-server/src/Servant/Auth/Server/Internal/ConfigTypes.hs
+++ b/servant-auth/servant-auth-server/src/Servant/Auth/Server/Internal/ConfigTypes.hs
@@ -6,7 +6,7 @@ module Servant.Auth.Server.Internal.ConfigTypes
 import           Crypto.JOSE        as Jose
 import           Crypto.JWT         as Jose
 import qualified Data.ByteString    as BS
-import           Data.Default.Class
+import           Data.Default
 import           Data.Time
 import           GHC.Generics       (Generic)
 import           Servant.API        (IsSecure(..))
diff --git a/servant-quickcheck/servant-quickcheck.cabal b/servant-quickcheck/servant-quickcheck.cabal
index 5917d5e34..13e9ca52f 100644
--- a/servant-quickcheck/servant-quickcheck.cabal
+++ b/servant-quickcheck/servant-quickcheck.cabal
@@ -41,7 +41,6 @@ library
     , bytestring             >=0.11   && <0.13
     , case-insensitive       >=1.2    && <1.3
     , clock                  >=0.7    && <0.9
-    , data-default-class     >=0.0    && <0.2
     , hspec                  >=2.5.6  && <2.12
     , http-client            >=0.7.0  && <0.8
     , http-media             >=0.6    && <0.9