diff --git a/src/GHC/Utils/GhcPkg/Main/Compat.hs b/src/GHC/Utils/GhcPkg/Main/Compat.hs
index 26f2da47b4..668216cd99 100644
--- a/src/GHC/Utils/GhcPkg/Main/Compat.hs
+++ b/src/GHC/Utils/GhcPkg/Main/Compat.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE OverloadedRecordDot   #-}
-{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
 {-|
 Module      : GHC.Utils.GhcPkg.Main.Compat
diff --git a/src/Stack/Component.hs b/src/Stack/Component.hs
index 135f131294..9b92d3df4a 100644
--- a/src/Stack/Component.hs
+++ b/src/Stack/Component.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude        #-}
-{-# LANGUAGE OverloadedRecordDot      #-}
-{-# LANGUAGE OverloadedStrings        #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
 {-|
 Module      : Stack.Component
diff --git a/src/Stack/List.hs b/src/Stack/List.hs
index 5a70bf2dc6..fbd22debb8 100644
--- a/src/Stack/List.hs
+++ b/src/Stack/List.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 {-|
 Module      : Stack.List
diff --git a/src/Stack/Options/IdeParser.hs b/src/Stack/Options/IdeParser.hs
index 14fb2a081e..6aa00b8d46 100644
--- a/src/Stack/Options/IdeParser.hs
+++ b/src/Stack/Options/IdeParser.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 {-|
 Module      : Stack.Options.IdeParser
diff --git a/src/Stack/Options/LsParser.hs b/src/Stack/Options/LsParser.hs
index 2ea3900991..968a11b969 100644
--- a/src/Stack/Options/LsParser.hs
+++ b/src/Stack/Options/LsParser.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE ApplicativeDo       #-}
-{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE ApplicativeDo     #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 {-|
 Module      : Stack.Options.LsParser
diff --git a/src/Stack/Storage/Util.hs b/src/Stack/Storage/Util.hs
index 9700109220..9f42732030 100644
--- a/src/Stack/Storage/Util.hs
+++ b/src/Stack/Storage/Util.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeFamilies      #-}
 
 {-|
 Module      : Stack.Storage.Util
diff --git a/src/Stack/Types/Build/ConstructPlan.hs b/src/Stack/Types/Build/ConstructPlan.hs
index 9e7dee3d93..554a7fd288 100644
--- a/src/Stack/Types/Build/ConstructPlan.hs
+++ b/src/Stack/Types/Build/ConstructPlan.hs
@@ -45,8 +45,8 @@ import           Stack.Types.Curator ( Curator )
 import           Stack.Types.DumpPackage ( DumpPackage )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..) )
-import           Stack.Types.GhcPkgId ( GhcPkgId )
 import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
+import           Stack.Types.GhcPkgId ( GhcPkgId )
 import           Stack.Types.Installed
                    ( InstallLocation, Installed (..), installedVersion )
 import           Stack.Types.IsMutable ( IsMutable )
@@ -56,7 +56,7 @@ import           Stack.Types.Package
                    )
 import           Stack.Types.ParentMap ( ParentMap )
 import           Stack.Types.Plan
-                    ( ComponentKey, Task (..), TaskType (..), taskProvides )
+                   ( ComponentKey, Task (..), TaskType (..), taskProvides )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.Runner ( HasRunner (..) )
 
diff --git a/src/Stack/Types/BuildOptsCLI.hs b/src/Stack/Types/BuildOptsCLI.hs
index dba26d0fd1..0f7d97a69b 100644
--- a/src/Stack/Types/BuildOptsCLI.hs
+++ b/src/Stack/Types/BuildOptsCLI.hs
@@ -1,7 +1,7 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
-{-# LANGUAGE OverloadedRecordDot   #-}
-{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
+{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
 {-|
 Module      : Stack.Types.BuildOptsCLI
diff --git a/src/Stack/Types/Casa.hs b/src/Stack/Types/Casa.hs
index 6cf0edd971..d1d8dd52bd 100644
--- a/src/Stack/Types/Casa.hs
+++ b/src/Stack/Types/Casa.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE NoFieldSelectors   #-}
-{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 {-|
 Module      : Stack.Types.Casa
diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs
index 33a2c10faf..a7e2fa7710 100644
--- a/src/Stack/Types/Compiler.hs
+++ b/src/Stack/Types/Compiler.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude  #-}
-{-# LANGUAGE OverloadedStrings  #-}
-{-# LANGUAGE TypeFamilies       #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
 
 {-|
 Module      : Stack.Types.Compiler
diff --git a/src/Stack/Types/Component.hs b/src/Stack/Types/Component.hs
index c6309a1605..90b5efec71 100644
--- a/src/Stack/Types/Component.hs
+++ b/src/Stack/Types/Component.hs
@@ -1,7 +1,7 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DuplicateRecordFields      #-}
-{-# LANGUAGE NoFieldSelectors           #-}
-{-# LANGUAGE OverloadedRecordDot        #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE OverloadedRecordDot   #-}
 
 {-|
 Module      : Stack.Types.Component
diff --git a/src/Stack/Types/ComponentUtils.hs b/src/Stack/Types/ComponentUtils.hs
index 6c965a79a0..1e89388f7a 100644
--- a/src/Stack/Types/ComponentUtils.hs
+++ b/src/Stack/Types/ComponentUtils.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude          #-}
-{-# LANGUAGE DuplicateRecordFields      #-}
+{-# LANGUAGE NoImplicitPrelude     #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 
 {-|
 Module      : Stack.Types.ComponentUtils
diff --git a/src/Stack/Types/Config/Exception.hs b/src/Stack/Types/Config/Exception.hs
index 3a935635a4..14044da2d8 100644
--- a/src/Stack/Types/Config/Exception.hs
+++ b/src/Stack/Types/Config/Exception.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
 
 {-|
 Module      : Stack.Types.Config.Exception
diff --git a/src/Stack/Types/ConfigSetOpts.hs b/src/Stack/Types/ConfigSetOpts.hs
index 702e2465a3..afc9573e03 100644
--- a/src/Stack/Types/ConfigSetOpts.hs
+++ b/src/Stack/Types/ConfigSetOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.ConfigSetOpts
diff --git a/src/Stack/Types/ConfigureOpts.hs b/src/Stack/Types/ConfigureOpts.hs
index 84f1e88ef2..860122d8c9 100644
--- a/src/Stack/Types/ConfigureOpts.hs
+++ b/src/Stack/Types/ConfigureOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE NoFieldSelectors    #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.ConfigureOpts
diff --git a/src/Stack/Types/GhciOpts.hs b/src/Stack/Types/GhciOpts.hs
index 17c6ecff07..02b6bc4935 100644
--- a/src/Stack/Types/GhciOpts.hs
+++ b/src/Stack/Types/GhciOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.GhciOpts
diff --git a/src/Stack/Types/HpcReportOpts.hs b/src/Stack/Types/HpcReportOpts.hs
index 97c09d31db..b7b4ed0221 100644
--- a/src/Stack/Types/HpcReportOpts.hs
+++ b/src/Stack/Types/HpcReportOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.HpcReportOpts
diff --git a/src/Stack/Types/LsOpts.hs b/src/Stack/Types/LsOpts.hs
index c818d5e46f..f476c06960 100644
--- a/src/Stack/Types/LsOpts.hs
+++ b/src/Stack/Types/LsOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.LsOpts
diff --git a/src/Stack/Types/SDistOpts.hs b/src/Stack/Types/SDistOpts.hs
index ced913053e..dc2dbfc823 100644
--- a/src/Stack/Types/SDistOpts.hs
+++ b/src/Stack/Types/SDistOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.SDistOpts
diff --git a/src/Stack/Types/SetupOpts.hs b/src/Stack/Types/SetupOpts.hs
index 5c44f8e9af..37a40237f7 100644
--- a/src/Stack/Types/SetupOpts.hs
+++ b/src/Stack/Types/SetupOpts.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude     #-}
-{-# LANGUAGE NoFieldSelectors      #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoFieldSelectors  #-}
 
 {-|
 Module      : Stack.Types.SetupOpts
diff --git a/src/windows/System/Terminal.hs b/src/windows/System/Terminal.hs
index 4d65a50f73..86074141bf 100644
--- a/src/windows/System/Terminal.hs
+++ b/src/windows/System/Terminal.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude        #-}
-{-# LANGUAGE OverloadedStrings        #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 {-|
 Module      : System.Terminal
diff --git a/tests/integration/IntegrationSpec.hs b/tests/integration/IntegrationSpec.hs
index a1a9a93add..54a190baa3 100644
--- a/tests/integration/IntegrationSpec.hs
+++ b/tests/integration/IntegrationSpec.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude   #-}
-{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 import           Conduit
                    ( (.|), connect, filterC, filterMC, foldMapC, mapM_C
diff --git a/tests/unit/Stack/Build/ConstructPlanSpec.hs b/tests/unit/Stack/Build/ConstructPlanSpec.hs
index c57d34cc90..40cbedffca 100644
--- a/tests/unit/Stack/Build/ConstructPlanSpec.hs
+++ b/tests/unit/Stack/Build/ConstructPlanSpec.hs
@@ -1,6 +1,6 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude   #-}
 {-# LANGUAGE OverloadedRecordDot #-}
+{-# LANGUAGE OverloadedStrings   #-}
 
 module Stack.Build.ConstructPlanSpec
   ( main
@@ -9,9 +9,11 @@ module Stack.Build.ConstructPlanSpec
 
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
+import           Database.Persist ( PersistField (..), PersistValue (..) )
 import           Distribution.CabalSpecVersion ( CabalSpecVersion (..) )
 import           Distribution.Compiler ( PerCompilerFlavor (..) )
 import           Distribution.License ( License (BSD3) )
+import           Distribution.ModuleName ( ModuleName )
 import qualified Distribution.ModuleName as Cabal
 import           Distribution.PackageDescription
                    ( BenchmarkInterface (..), BenchmarkType (..)
@@ -27,7 +29,6 @@ import           Distribution.Types.ModuleRenaming
 import           Distribution.Types.PackageName ( mkPackageName )
 import           Distribution.Types.Version ( mkVersion )
 import           Distribution.Types.VersionRange ( anyVersion )
-import           Distribution.ModuleName ( ModuleName )
 import           Stack.Build.Backpack ( addInstantiationTasks )
 import           Stack.Build.ConstructPlan ( shouldSplitComponents )
 import           Stack.Build.ExecutePackage
@@ -38,7 +39,6 @@ import           Stack.Package
                    )
 import           Stack.Prelude
 import           Stack.Types.Build.ConstructPlan ( AddDepRes (..) )
-import           Database.Persist ( PersistField (..), PersistValue (..) )
 import           Stack.Types.Cache ( CachePkgSrc (..), ConfigCacheType (..) )
 import           Stack.Types.CompCollection
                    ( foldAndMakeCollection, getBuildableSet )
diff --git a/tests/unit/Stack/Build/ExecuteSpec.hs b/tests/unit/Stack/Build/ExecuteSpec.hs
index b4a71d521f..4342810141 100644
--- a/tests/unit/Stack/Build/ExecuteSpec.hs
+++ b/tests/unit/Stack/Build/ExecuteSpec.hs
@@ -6,12 +6,11 @@ module Stack.Build.ExecuteSpec
   , spec
   ) where
 
+import           Control.Concurrent.Execute ( ActionId (..), ActionType (..) )
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import           Distribution.Types.PackageName ( mkPackageName )
 import           Distribution.Types.Version ( mkVersion )
-import           Control.Concurrent.Execute
-                   ( ActionId (..), ActionType (..) )
 import           Stack.Build.Execute
                    ( finalTestsAndBenches, intraPackageDeps, missingToDeps )
 import           Stack.Build.ExecutePackage
diff --git a/tests/unit/Stack/Ghci/ScriptSpec.hs b/tests/unit/Stack/Ghci/ScriptSpec.hs
index 8515f38fff..670639eb02 100644
--- a/tests/unit/Stack/Ghci/ScriptSpec.hs
+++ b/tests/unit/Stack/Ghci/ScriptSpec.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE OverloadedLists   #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell   #-}
 
 -- | Test suite for the GhciScript DSL
diff --git a/tests/unit/Stack/Types/TemplateNameSpec.hs b/tests/unit/Stack/Types/TemplateNameSpec.hs
index b5cff7fe91..b5138c102a 100644
--- a/tests/unit/Stack/Types/TemplateNameSpec.hs
+++ b/tests/unit/Stack/Types/TemplateNameSpec.hs
@@ -4,10 +4,10 @@ module Stack.Types.TemplateNameSpec
   ( spec
   ) where
 
-import Stack.Types.TemplateName
-import Path.Internal
-import System.Info (os)
-import Test.Hspec
+import           Path.Internal
+import           Stack.Types.TemplateName
+import           System.Info ( os )
+import           Test.Hspec
 
 spec :: Spec
 spec =