diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -244,6 +244,6 @@
 
 With haskell-ci tooling installed, generate the `.travis.yml` setup with;
 ```
-> make-travis-yml --output=.travis.yml --config=cabal.haskell-ci hpack-dhall.cabal
-*INFO* Generating Travis-CI config for testing for GHC versions: 8.4.3 8.4.4 8.6.1 8.6.2
+> haskell-ci --output=.travis.yml --config=cabal.haskell-ci hpack-dhall.cabal
+*INFO* Generating Travis-CI config for testing for GHC versions: 8.2.2 8.4.3 8.4.4 8.6.3
 ```
diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,10 @@
 The [latest version](https://github.com/blockscope/hpack-dhall/blob/master/changelog.md) of this changelog.
 
-## 0.5.1 - Sorted Fields Pretty Printing
+## 0.5.2 - Consistent Golden Tests
+* Use explicit dependencies to achieve consistent golden tests in all but
+  stack-8.6.3.yaml.
+
+## 0.5.1 - Minor, bump in hpack version 
 * Regenerate golden files for the bump in hpack's version:
 
 ```
diff --git a/exe/dhall-hpack-cabal/CabalMain.hs b/exe/dhall-hpack-cabal/CabalMain.hs
--- a/exe/dhall-hpack-cabal/CabalMain.hs
+++ b/exe/dhall-hpack-cabal/CabalMain.hs
@@ -29,7 +29,7 @@
     pkgFile <- parsePkgFile
     force <- parseForce
     quiet <- parseQuiet
-    return (Options {..})
+    return Options{..}
 
 parserInfo :: O.ParserInfo Command
 parserInfo =
diff --git a/exe/options/Options.hs b/exe/options/Options.hs
--- a/exe/options/Options.hs
+++ b/exe/options/Options.hs
@@ -20,7 +20,7 @@
 parseOptions :: Parser Options
 parseOptions = helper <*> do
     pkgFile <- parsePkgFile
-    return (Options {..})
+    return Options{..}
 
 parsePkgFile :: Parser FilePath
 parsePkgFile =
diff --git a/hpack-dhall.cabal b/hpack-dhall.cabal
--- a/hpack-dhall.cabal
+++ b/hpack-dhall.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: b3f8d5f1300d63e3eb10dd2b12fac8f38da8deb93e323b4fd95a0ffe9bbad9e9
+-- hash: 98b50eed37278c62f016933a31bdfb02a687ae915796045d96e6357a4a826acb
 
 name:           hpack-dhall
-version:        0.5.1
+version:        0.5.2
 synopsis:       hpack's dhalling
 description:    Work with hpack's top-level
                 <https://github.com/sol/hpack#top-level-fields fields> in a Dhall
@@ -24,7 +24,7 @@
 copyright:      © 2018 Phil de Joux, © 2018 Block Scope Limited
 license:        BSD3
 license-file:   LICENSE
-tested-with:    GHC == 8.4.3, GHC == 8.4.4, GHC == 8.6.1, GHC == 8.6.2
+tested-with:    GHC == 8.2.2, GHC == 8.4.3, GHC == 8.4.4, GHC == 8.6.3
 build-type:     Simple
 extra-source-files:
     package.dhall
diff --git a/package.dhall b/package.dhall
--- a/package.dhall
+++ b/package.dhall
@@ -17,11 +17,11 @@
 
 in  let exe-deps =
           [ "hpack-dhall", "optparse-applicative" ]
-    
+
     in  { name =
             "hpack-dhall"
         , version =
-            "0.5.1"
+            "0.5.2"
         , maintainer =
             "Phil de Joux <phil.dejoux@blockscope.com>"
         , copyright =
@@ -39,7 +39,7 @@
             Work with hpack's top-level
             <https://github.com/sol/hpack#top-level-fields fields> in a Dhall
             record with the following executables;
-            
+
             * with @dhall-hpack-cabal@ write the @.cabal@ for a @.dhall@ package description.
             * with @dhall-hpack-dhall@ show the package description expression, with imports resolved.
             * with @dhall-hpack-json@ show the package description as JSON.
@@ -48,7 +48,7 @@
         , github =
             "blockscope/hpack-dhall"
         , tested-with =
-            "GHC == 8.4.3, GHC == 8.4.4, GHC == 8.6.1, GHC == 8.6.2"
+            "GHC == 8.2.2, GHC == 8.4.3, GHC == 8.4.4, GHC == 8.6.3"
         , extra-source-files =
             [ "package.dhall"
             , "changelog.md"
diff --git a/test/golden/test-files/key/empty-inferred/package.yaml.cabal b/test/golden/test-files/key/empty-inferred/package.yaml.cabal
--- a/test/golden/test-files/key/empty-inferred/package.yaml.cabal
+++ b/test/golden/test-files/key/empty-inferred/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/key/empty-package.yaml.cabal b/test/golden/test-files/key/empty-package.yaml.cabal
--- a/test/golden/test-files/key/empty-package.yaml.cabal
+++ b/test/golden/test-files/key/empty-package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from empty-package.yaml by hpack version 0.31.1.
+-- This file has been generated from empty-package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/key/import-local/package.yaml.cabal b/test/golden/test-files/key/import-local/package.yaml.cabal
--- a/test/golden/test-files/key/import-local/package.yaml.cabal
+++ b/test/golden/test-files/key/import-local/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/key/import-relative/package.yaml.cabal b/test/golden/test-files/key/import-relative/package.yaml.cabal
--- a/test/golden/test-files/key/import-relative/package.yaml.cabal
+++ b/test/golden/test-files/key/import-relative/package.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.31.1.
+-- This file has been generated from package.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/key/when-dependencies.yaml.cabal b/test/golden/test-files/key/when-dependencies.yaml.cabal
--- a/test/golden/test-files/key/when-dependencies.yaml.cabal
+++ b/test/golden/test-files/key/when-dependencies.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from when-dependencies.yaml by hpack version 0.31.1.
+-- This file has been generated from when-dependencies.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/real-world/hpack/hpack.yaml.cabal b/test/golden/test-files/real-world/hpack/hpack.yaml.cabal
--- a/test/golden/test-files/real-world/hpack/hpack.yaml.cabal
+++ b/test/golden/test-files/real-world/hpack/hpack.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from hpack.yaml by hpack version 0.31.1.
+-- This file has been generated from hpack.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/real-world/stack/stack.yaml b/test/golden/test-files/real-world/stack/stack.yaml
--- a/test/golden/test-files/real-world/stack/stack.yaml
+++ b/test/golden/test-files/real-world/stack/stack.yaml
@@ -1,7 +1,7 @@
 name: stack
 version: 1.10.0
 synopsis: The Haskell Tool Stack
-description: ! 'Please see the README.md for usage information, and
+description: 'Please see the README.md for usage information, and
 
   the wiki on Github for more details.  Also, note that
 
@@ -31,7 +31,7 @@
 - -fwarn-tabs
 - -fwarn-incomplete-uni-patterns
 - -fwarn-incomplete-record-updates
-- ! '-optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue
+- '-optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue
   #4739 · haskell/cabal](https://github.com/haskell/cabal/issues/4739)'
 dependencies:
 - Cabal >= 2.4
@@ -316,7 +316,7 @@
       - -static
       - -pthread
       dependencies: []
-    - condition: ! '!(flag(disable-git-info))'
+    - condition: '!(flag(disable-git-info))'
       cpp-options:
       - -DUSE_GIT_INFO
       ld-options: []
@@ -346,7 +346,7 @@
     dependencies:
     - hspec
     when:
-      condition: ! '!flag(integration-tests)'
+      condition: '!flag(integration-tests)'
       buildable: false
   stack-test:
     main: Spec.hs
diff --git a/test/golden/test-files/real-world/stack/stack.yaml.cabal b/test/golden/test-files/real-world/stack/stack.yaml.cabal
--- a/test/golden/test-files/real-world/stack/stack.yaml.cabal
+++ b/test/golden/test-files/real-world/stack/stack.yaml.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 
--- This file has been generated from stack.yaml by hpack version 0.31.1.
+-- This file has been generated from stack.yaml by hpack version 0.31.2.
 --
 -- see: https://github.com/sol/hpack
 --
diff --git a/test/golden/test-files/real-world/stack/stack.yaml.golden b/test/golden/test-files/real-world/stack/stack.yaml.golden
--- a/test/golden/test-files/real-world/stack/stack.yaml.golden
+++ b/test/golden/test-files/real-world/stack/stack.yaml.golden
@@ -1,7 +1,7 @@
 name: stack
 version: 1.10.0
 synopsis: The Haskell Tool Stack
-description: ! 'Please see the README.md for usage information, and
+description: 'Please see the README.md for usage information, and
 
   the wiki on Github for more details.  Also, note that
 
@@ -31,7 +31,7 @@
 - -fwarn-tabs
 - -fwarn-incomplete-uni-patterns
 - -fwarn-incomplete-record-updates
-- ! '-optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue
+- '-optP-Wno-nonportable-include-path # workaround [Filename case on macOS · Issue
   #4739 · haskell/cabal](https://github.com/haskell/cabal/issues/4739)'
 dependencies:
 - Cabal >= 2.4
@@ -316,7 +316,7 @@
       - -static
       - -pthread
       dependencies: []
-    - condition: ! '!(flag(disable-git-info))'
+    - condition: '!(flag(disable-git-info))'
       cpp-options:
       - -DUSE_GIT_INFO
       ld-options: []
@@ -346,7 +346,7 @@
     dependencies:
     - hspec
     when:
-      condition: ! '!flag(integration-tests)'
+      condition: '!flag(integration-tests)'
       buildable: false
   stack-test:
     main: Spec.hs