diff --git a/doctest/DoctestDriver.hs b/doctest/DoctestDriver.hs
new file mode 100644
--- /dev/null
+++ b/doctest/DoctestDriver.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+
+#if MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
+{-# OPTIONS_GHC -F -pgmF doctest-discover #-}
+#else
+module Main where
+
+import qualified System.IO as IO
+
+main :: IO ()
+main = IO.putStrLn "WARNING: doctest will not run on GHC versions earlier than 8.4.4"
+#endif
diff --git a/hw-aeson.cabal b/hw-aeson.cabal
--- a/hw-aeson.cabal
+++ b/hw-aeson.cabal
@@ -1,58 +1,73 @@
-cabal-version:      2.2
+cabal-version: 2.2
 
-name:                 hw-aeson
-version:              0.1.0.2
-synopsis:             Convenience functions for Aeson
-description:          Convenience functions for Aeson.
-category:             Data, JSON
-homepage:             https://github.com/haskell-works/hw-aeson#readme
-bug-reports:          https://github.com/haskell-works/hw-aeson/issues
-author:               John Ky
-maintainer:           newhoggy@gmail.com
-copyright:            2018-2019 John Ky
-license:              BSD-3-Clause
-license-file:         LICENSE
-tested-with:          GHC == 8.8.1, GHC == 8.6.5, GHC == 8.4.4, GHC == 8.2.2
-build-type:           Simple
-extra-source-files:   README.md
+name:                   hw-aeson
+version:                0.1.1.0
+synopsis:               Convenience functions for Aeson
+description:            Convenience functions for Aeson.
+category:               Data, JSON
+homepage:               https://github.com/haskell-works/hw-aeson#readme
+bug-reports:            https://github.com/haskell-works/hw-aeson/issues
+author:                 John Ky
+maintainer:             newhoggy@gmail.com
+copyright:              2018-2020 John Ky
+license:                BSD-3-Clause
+license-file:           LICENSE
+tested-with:            GHC == 8.10.1, GHC == 8.8.3, GHC == 8.6.5, GHC == 8.4.4
+build-type:             Simple
+extra-source-files:     README.md
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-aeson
 
-common base       { build-depends: base       >= 4.10   && < 5    }
+common base                       { build-depends: base                       >= 4.11       && < 5      }
 
-common aeson      { build-depends: aeson      >= 1.4    && < 1.5  }
-common hedgehog   { build-depends: hedgehog   >= 0.6    && < 1.1  }
-common hspec      { build-depends: hspec      >= 2.4    && < 3    }
-common text       { build-depends: text       >= 1.2    && < 1.3  }
+common doctest                    { build-depends: doctest                    >= 0.16.2     && < 0.17   }
+common doctest-discover           { build-depends: doctest-discover           >= 0.2        && < 0.3    }
+common aeson                      { build-depends: aeson                      >= 1.4        && < 1.5    }
+common hedgehog                   { build-depends: hedgehog                   >= 0.6        && < 1.1    }
+common hspec                      { build-depends: hspec                      >= 2.4        && < 3      }
+common text                       { build-depends: text                       >= 1.2        && < 1.3    }
 
 common config
 
 common hw-aeson
-  build-depends:      hw-aeson
+  build-depends:        hw-aeson
 
 library
-  import:             base, config
-                    , aeson
-                    , text
-  other-modules:      Paths_hw_aeson
-  autogen-modules:    Paths_hw_aeson
-  hs-source-dirs:     src
-  default-language:   Haskell2010
-  exposed-modules:    HaskellWorks.Data.Aeson
+  import:               base, config
+                      , aeson
+                      , text
+  other-modules:        Paths_hw_aeson
+  autogen-modules:      Paths_hw_aeson
+  hs-source-dirs:       src
+  default-language:     Haskell2010
+  exposed-modules:      HaskellWorks.Data.Aeson
 
 test-suite hw-aeson-test
-  import:             base, config
-                    , aeson
-                    , hedgehog
-                    , hspec
-                    , hw-aeson
-  type:               exitcode-stdio-1.0
-  main-is:            Spec.hs
-  ghc-options:        -threaded -rtsopts -with-rtsopts=-N
-  hs-source-dirs:     test
-  default-language:   Haskell2010
-  autogen-modules:    Paths_hw_aeson
-  other-modules:      HaskellWorks.Data.AesonSpec
-                      Paths_hw_aeson
+  import:               base, config
+                      , aeson
+                      , hedgehog
+                      , hspec
+                      , hw-aeson
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N
+  hs-source-dirs:       test
+  default-language:     Haskell2010
+  autogen-modules:      Paths_hw_aeson
+  build-tool-depends:   hspec-discover:hspec-discover
+  other-modules:        HaskellWorks.Data.AesonSpec
+                        Paths_hw_aeson
+
+test-suite doctest
+  import:               base, config
+                      , doctest
+                      , doctest-discover
+                      , hw-aeson
+  default-language:     Haskell2010
+  type:                 exitcode-stdio-1.0
+  ghc-options:          -threaded
+  main-is:              DoctestDriver.hs
+  HS-Source-Dirs:       doctest
+  build-tool-depends:   doctest-discover:doctest-discover
diff --git a/src/HaskellWorks/Data/Aeson.hs b/src/HaskellWorks/Data/Aeson.hs
--- a/src/HaskellWorks/Data/Aeson.hs
+++ b/src/HaskellWorks/Data/Aeson.hs
@@ -5,7 +5,6 @@
 
 import Data.Aeson
 import Data.Aeson.Types
-import Data.Semigroup   ((<>))
 import Data.Text
 import Text.Read
 
diff --git a/test/HaskellWorks/Data/AesonSpec.hs b/test/HaskellWorks/Data/AesonSpec.hs
--- a/test/HaskellWorks/Data/AesonSpec.hs
+++ b/test/HaskellWorks/Data/AesonSpec.hs
@@ -5,7 +5,6 @@
   ) where
 
 import Data.Aeson
-import Data.Semigroup
 import HaskellWorks.Data.Aeson
 import Test.Hspec