diff --git a/tests/integration/tests/111-custom-snapshot/Main.hs b/tests/integration/tests/111-custom-snapshot/Main.hs
index 9c6bfb055b..b6498ef21a 100644
--- a/tests/integration/tests/111-custom-snapshot/Main.hs
+++ b/tests/integration/tests/111-custom-snapshot/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/111
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stack ["build"]
diff --git a/tests/integration/tests/1884-url-to-tarball/Main.hs b/tests/integration/tests/1884-url-to-tarball/Main.hs
index 19e9a55117..62e48d315c 100644
--- a/tests/integration/tests/1884-url-to-tarball/Main.hs
+++ b/tests/integration/tests/1884-url-to-tarball/Main.hs
@@ -2,7 +2,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/1884
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stack ["build", "--dry-run"]
diff --git a/tests/integration/tests/2195-depend-on-exe/Main.hs b/tests/integration/tests/2195-depend-on-exe/Main.hs
index e78a9e7902..19fd17a3f0 100644
--- a/tests/integration/tests/2195-depend-on-exe/Main.hs
+++ b/tests/integration/tests/2195-depend-on-exe/Main.hs
@@ -1,6 +1,7 @@
 -- Stack reports an error if a package component depends on a package that has
 -- no library component.
 --
+-- See: https://github.com/commercialhaskell/stack/issues/2195
 
 import           Control.Monad ( unless )
 import           Data.List ( isInfixOf )
@@ -8,8 +9,8 @@ import           StackTest
 
 main :: IO ()
 main = stackErrStderr
-         ["build", "myPackageB"]
-         (expectMessage "package provides no library")
+  ["build", "myPackageB"]
+  (expectMessage "package provides no library")
 
 expectMessage :: String -> String -> IO ()
 expectMessage msg stderr =
diff --git a/tests/integration/tests/2643-copy-compiler-tool/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/Main.hs
index cbb05b4819..d4e5d631ed 100644
--- a/tests/integration/tests/2643-copy-compiler-tool/Main.hs
+++ b/tests/integration/tests/2643-copy-compiler-tool/Main.hs
@@ -1,64 +1,50 @@
-import StackTest
-import System.Directory
-import Control.Monad (unless)
+-- Stack can install targets that are executables as compiler tools.
 
-main :: IO ()
-main = do
-  -- init
-  removeFileIgnore "stack.yaml"
-  removeDirIgnore ".stack-work"
-  stack ["init", defaultSnapshotArg]
+-- See: https://github.com/commercialhaskell/stack/issues/2643
 
-  -- place to throw some exes
-  removeDirIgnore "binny"
-  createDirectory "binny"
-
-  -- check assumptions on exec and the build flags and clean
-  stack ["build", "--flag", "copy-compiler-tool-test:build-baz"]
-  stack ["exec", "--", "baz-exe" ++ exeExt]
-  stackErr ["exec", "--", "bar-exe" ++ exeExt]
-  stackCleanFull
-  -- See #4936. The Windows condition is because `stackCleanFull` may have
-  -- failed.
-  unless isWindows $ stackErr ["exec", "--", "baz-exe" ++ exeExt]
+import           Control.Monad ( unless )
+import           StackTest
+import           System.Directory ()
 
-  -- install one exe normally
+main :: IO ()
+main = do
+  -- Install myExeA executable normally:
   stack ["install",
-         "--local-bin-path", "./binny",
-         "--flag", "*:build-foo"
+         "--local-bin-path", "./bin",
+         "--flag", "myPackage:build-myExeA"
         ]
 
-  -- and install two compiler-tools, opposite ways
-  -- (build or install)
+  -- Install myExeB and myExeC executables as compiler tools, in alternative
+  -- ways (build or install):
   stack ["build",
-         "--local-bin-path", "./binny",
+         "--local-bin-path", "./bin",
          "--copy-compiler-tool",
-         "--flag", "*:build-bar"
+         "--flag", "myPackage:build-myExeB"
         ]
   stack ["install",
-         "--local-bin-path", "./binny",
+         "--local-bin-path", "./bin",
          "--copy-compiler-tool",
-         "--flag", "*:build-baz"
+         "--flag", "myPackage:build-myExeC"
         ]
 
-  -- nuke the built things that go in .stack-work/, so we can test if
-  -- the installed ones exist for sure
+  -- Remove .stack-work/, so we can test if the installed ones exist:
   stackCleanFull
 
-  -- bar and baz were installed as compiler tools, should work fine
-  stack ["exec", "--", "bar-exe" ++ exeExt]
-  stack ["exec", "--", "baz-exe" ++ exeExt]
+  -- myExeB and myExeC were installed as compiler tools and should work:
+  stack ["exec", "--", "myExeB" <> exeExt]
+  stack ["exec", "--", "myExeC" <> exeExt]
+
+  -- myExeA was installed in .bin/, which is not on the PATH, and should not
+  -- work.
 
-  -- foo was installed as a normal exe (in .binny/, which can't be on PATH),
-  -- so shouldn't
-  -- See #4936. The Windows condition is because `stackCleanFull` may have
-  -- failed.
-  unless isWindows $ stackErr ["exec", "--", "foo-exe" ++ exeExt]
+  -- The Windows condition is because `stackCleanFull` may have failed (see
+  -- issue #4936):
+  unless isWindows $ stackErr ["exec", "--", "myExeA" <> exeExt]
 
-  -- check existences make sense
-  doesExist $ "./binny/foo-exe" ++ exeExt
-  doesNotExist $ "./binny/bar-exe" ++ exeExt
-  doesNotExist $ "./binny/baz-exe" ++ exeExt
+  -- Check existences make sense:
+  doesExist $ "./bin/myExeA" <> exeExt
+  doesNotExist $ "./bin/myExeB" <> exeExt
+  doesNotExist $ "./bin/myExeC" <> exeExt
 
-  -- just check that this exists
+  -- Check that this exists
   stack ["path", "--compiler-tools-bin"]
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore b/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore
index 56f4748f50..f3f0a84c6f 100644
--- a/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/.gitignore
@@ -1,2 +1,3 @@
-binny/
-stack.yaml
+.stack-work/
+bin/
+myPackage.cabal
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/Bar.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Bar.hs
deleted file mode 100644
index 7498d2965c..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/Bar.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "twotwotwo"
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/Baz.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Baz.hs
deleted file mode 100644
index 3f276659c9..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/Baz.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "threethreethree"
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/Foo.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Foo.hs
deleted file mode 100644
index 8abe1be7d5..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/Foo.hs
+++ /dev/null
@@ -1 +0,0 @@
-main = putStrLn "oneoneone"
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/LICENSE b/tests/integration/tests/2643-copy-compiler-tool/files/LICENSE
deleted file mode 100644
index d05408d876..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Your name here nor the names of other
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/Setup.hs b/tests/integration/tests/2643-copy-compiler-tool/files/Setup.hs
deleted file mode 100644
index 9a994af677..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appA/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appB/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs b/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs
new file mode 100644
index 0000000000..a31c5a029d
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/appC/Main.hs
@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = pure ()
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal b/tests/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal
deleted file mode 100644
index e1f66caf91..0000000000
--- a/tests/integration/tests/2643-copy-compiler-tool/files/copy-compiler-tool-test.cabal
+++ /dev/null
@@ -1,54 +0,0 @@
-name:                copy-compiler-tool-test
-version:             0.1.0.0
-synopsis:            Initial project template from stack
-description:         Please see README.md
-homepage:            http://invalid/
-license:             BSD3
-license-file:        LICENSE
-author:              Your name here
-maintainer:          your.address@example.com
--- copyright:
-category:            Web
-build-type:          Simple
--- extra-source-files:
-cabal-version:       >=1.10
-
-flag build-foo
-  manual: True
-  default: False
-  description: Build foo
-
-flag build-bar
-  manual: True
-  default: False
-  description: Build bar
-
-flag build-baz
-  manual: True
-  default: False
-  description: Build baz
-
-executable foo-exe
-  main-is:             Foo.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-foo)
-    buildable: False
-
-executable bar-exe
-  main-is:             Bar.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-bar)
-    buildable: False
-
-executable baz-exe
-  main-is:             Baz.hs
-  build-depends:       base
-  default-language:    Haskell2010
-  if !flag(build-baz)
-    buildable: False
-
-source-repository head
-  type:     git
-  location: https://invalid/
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml b/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml
new file mode 100644
index 0000000000..8759081629
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/package.yaml
@@ -0,0 +1,40 @@
+spec-version: 0.36.0
+
+name: myPackage
+
+flags:
+  build-myExeA:
+    description: Build myExeA
+    default: false
+    manual: true
+  build-myExeB:
+    description: Build myExeB
+    default: false
+    manual: true
+  build-myExeC:
+    description: Build myExeC
+    default: false
+    manual: true
+
+dependencies:
+- base
+
+executables:
+  myExeA:
+    source-dirs: appA
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeA)"
+      buildable: false
+  myExeB:
+    source-dirs: appB
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeB)"
+      buildable: false
+  myExeC:
+    source-dirs: appC
+    main: Main.hs
+    when:
+    - condition: "!flag(build-myExeC)"
+      buildable: false
diff --git a/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml b/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml
new file mode 100644
index 0000000000..e674eab75a
--- /dev/null
+++ b/tests/integration/tests/2643-copy-compiler-tool/files/stack.yaml
@@ -0,0 +1 @@
+snapshot: ghc-9.10.3
diff --git a/tests/integration/tests/2781-shadow-bug/Main.hs b/tests/integration/tests/2781-shadow-bug/Main.hs
index 53c215393b..7f9e65e4ba 100644
--- a/tests/integration/tests/2781-shadow-bug/Main.hs
+++ b/tests/integration/tests/2781-shadow-bug/Main.hs
@@ -2,8 +2,8 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/2781
 
-import StackTest
-import System.Directory ( createDirectoryIfMissing )
+import           StackTest
+import           System.Directory ( createDirectoryIfMissing )
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/2997-ensure-warnings-output/Main.hs b/tests/integration/tests/2997-ensure-warnings-output/Main.hs
index 7b0d615165..3b0b049dca 100644
--- a/tests/integration/tests/2997-ensure-warnings-output/Main.hs
+++ b/tests/integration/tests/2997-ensure-warnings-output/Main.hs
@@ -3,8 +3,8 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/2997
 
-import Data.List ( isInfixOf )
-import StackTest
+import           Data.List ( isInfixOf )
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/3315-multi-ghc-options/Main.hs b/tests/integration/tests/3315-multi-ghc-options/Main.hs
index 53fde2b204..bf93687b96 100644
--- a/tests/integration/tests/3315-multi-ghc-options/Main.hs
+++ b/tests/integration/tests/3315-multi-ghc-options/Main.hs
@@ -2,7 +2,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3315
 
-import StackTest.Repl
+import           StackTest.Repl
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/3390-unbuildable-test/Main.hs b/tests/integration/tests/3390-unbuildable-test/Main.hs
index 50f4eba276..d6e021b8b4 100644
--- a/tests/integration/tests/3390-unbuildable-test/Main.hs
+++ b/tests/integration/tests/3390-unbuildable-test/Main.hs
@@ -2,7 +2,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3390
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stack ["test"]
diff --git a/tests/integration/tests/3574-extra-dep-local/Main.hs b/tests/integration/tests/3574-extra-dep-local/Main.hs
index 0c73c77b2e..e9b1b0286b 100644
--- a/tests/integration/tests/3574-extra-dep-local/Main.hs
+++ b/tests/integration/tests/3574-extra-dep-local/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3574
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stack ["build", "myPackage"]
diff --git a/tests/integration/tests/3631-build-http2/Main.hs b/tests/integration/tests/3631-build-http2/Main.hs
index 56518962a8..86e1a37637 100644
--- a/tests/integration/tests/3631-build-http2/Main.hs
+++ b/tests/integration/tests/3631-build-http2/Main.hs
@@ -1,9 +1,8 @@
 -- Stack can build the http2 package.
 --
---
 -- https://github.com/commercialhaskell/stack/issues/3631
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/384-local-deps/Main.hs b/tests/integration/tests/384-local-deps/Main.hs
index bf08823e28..ae4c43fa95 100644
--- a/tests/integration/tests/384-local-deps/Main.hs
+++ b/tests/integration/tests/384-local-deps/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/384
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs b/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
index 12ce4c6fdd..5786914f26 100644
--- a/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
+++ b/tests/integration/tests/3861-ignore-bounds-in-snapshots/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3861
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs b/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs
index de824bfca1..838ab61a93 100644
--- a/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs
+++ b/tests/integration/tests/3926-ghci-with-sublibraries/Main.hs
@@ -3,10 +3,10 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3926
 
-import Control.Monad ( unless, when )
-import Control.Monad.IO.Class ( liftIO )
-import Data.List ( isInfixOf, isSuffixOf )
-import StackTest.Repl
+import           Control.Monad ( unless, when )
+import           Control.Monad.IO.Class ( liftIO )
+import           Data.List ( isInfixOf, isSuffixOf )
+import           StackTest.Repl
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/3940-base-upgrade-warning/Main.hs b/tests/integration/tests/3940-base-upgrade-warning/Main.hs
index 78c9521283..1dff182949 100644
--- a/tests/integration/tests/3940-base-upgrade-warning/Main.hs
+++ b/tests/integration/tests/3940-base-upgrade-warning/Main.hs
@@ -4,9 +4,9 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/3940
 
-import Control.Monad ( unless )
-import Data.List ( isInfixOf )
-import StackTest
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
 
 -- Use short message fragment because prettyWarn formatting and colour
 unattainableBaseWarning :: String
diff --git a/tests/integration/tests/397-case-insensitive-flags/Main.hs b/tests/integration/tests/397-case-insensitive-flags/Main.hs
index 38eb51ed26..e499de5c9d 100644
--- a/tests/integration/tests/397-case-insensitive-flags/Main.hs
+++ b/tests/integration/tests/397-case-insensitive-flags/Main.hs
@@ -2,7 +2,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/397
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs b/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs
index 9736da7645..cc0f41d298 100644
--- a/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs
+++ b/tests/integration/tests/4181-clean-wo-dl-ghc/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/4181
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/443-specify-path/Main.hs b/tests/integration/tests/443-specify-path/Main.hs
index 4c01c57e58..56e5e074fa 100644
--- a/tests/integration/tests/443-specify-path/Main.hs
+++ b/tests/integration/tests/443-specify-path/Main.hs
@@ -14,17 +14,17 @@ main = do
 
   -- Install in current dir
   stack [ "--local-bin-path", ".", "install" ]
-  doesExist myPackageExe
+  doesExist myExe
 
   -- Install in relative path
   createDirectory "bin"
   stack [ "--local-bin-path", "./bin", "install" ]
-  doesExist ("./bin/" <> myPackageExe)
+  doesExist ("./bin/" <> myExe)
 
   -- Install in absolute path
   tmpDirectory <- fmap (</> "bin-absolute") getCurrentDirectory
   createDirectory tmpDirectory
   stack [ "--local-bin-path", tmpDirectory, "install" ]
-  doesExist (tmpDirectory </> myPackageExe)
+  doesExist (tmpDirectory </> myExe)
  where
-  myPackageExe = "myPackage" <> exeExt
+  myExe = "myExe" <> exeExt
diff --git a/tests/integration/tests/443-specify-path/files/package.yaml b/tests/integration/tests/443-specify-path/files/package.yaml
index 113821465d..ee1f9f8afa 100644
--- a/tests/integration/tests/443-specify-path/files/package.yaml
+++ b/tests/integration/tests/443-specify-path/files/package.yaml
@@ -1,12 +1,11 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
 
 executables:
-  myPackage:
+  myExe:
     source-dirs: app
     main: Main.hs
diff --git a/tests/integration/tests/444-package-option/Main.hs b/tests/integration/tests/444-package-option/Main.hs
index a5baaca85f..cf0f314fc4 100644
--- a/tests/integration/tests/444-package-option/Main.hs
+++ b/tests/integration/tests/444-package-option/Main.hs
@@ -1,8 +1,9 @@
-import StackTest
+-- Stack's runghc command allows packages to be identified for use with scripts.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/444
+
+import           StackTest
 
 main :: IO ()
-main = do
-  isAlpine <- getIsAlpine
-  if isAlpine || isARM
-    then logInfo "Disabled on Alpine Linux and ARM since it cannot yet install its own GHC."
-    else stack [defaultSnapshotArg, "--install-ghc", "runghc", "--package", "safe", "Test.hs"]
+main = stack
+  ["--snapshot", "mySnapshot.yaml", "runghc", "--package", "acme-missiles", "Script.hs"]
diff --git a/tests/integration/tests/444-package-option/files/Script.hs b/tests/integration/tests/444-package-option/files/Script.hs
new file mode 100644
index 0000000000..97f6a45c8d
--- /dev/null
+++ b/tests/integration/tests/444-package-option/files/Script.hs
@@ -0,0 +1,4 @@
+import           Acme.Missiles ( launchMissiles )
+
+main :: IO ()
+main = launchMissiles
diff --git a/tests/integration/tests/444-package-option/files/Test.hs b/tests/integration/tests/444-package-option/files/Test.hs
deleted file mode 100644
index 681ec416d9..0000000000
--- a/tests/integration/tests/444-package-option/files/Test.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-import Safe
-
-main :: IO ()
-main = print $ headMay ([] :: [Int])
diff --git a/tests/integration/tests/444-package-option/files/mySnapshot.yaml b/tests/integration/tests/444-package-option/files/mySnapshot.yaml
new file mode 100644
index 0000000000..09bb7df5ab
--- /dev/null
+++ b/tests/integration/tests/444-package-option/files/mySnapshot.yaml
@@ -0,0 +1,6 @@
+name: mySnapshot
+
+snapshot: ghc-9.10.3
+
+packages:
+- acme-missiles-0.3
diff --git a/tests/integration/tests/4897-boot-package-pruned/files/package.yaml b/tests/integration/tests/4897-boot-package-pruned/files/package.yaml
index 625da91c48..2a46ba72d4 100644
--- a/tests/integration/tests/4897-boot-package-pruned/files/package.yaml
+++ b/tests/integration/tests/4897-boot-package-pruned/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
diff --git a/tests/integration/tests/606-local-version-not-exist/Main.hs b/tests/integration/tests/606-local-version-not-exist/Main.hs
index 02f4066f51..cfd6a18a03 100644
--- a/tests/integration/tests/606-local-version-not-exist/Main.hs
+++ b/tests/integration/tests/606-local-version-not-exist/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/606
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/617-extra-dep-flag/Main.hs b/tests/integration/tests/617-extra-dep-flag/Main.hs
index eefa091b4f..b4b45ef978 100644
--- a/tests/integration/tests/617-extra-dep-flag/Main.hs
+++ b/tests/integration/tests/617-extra-dep-flag/Main.hs
@@ -2,7 +2,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/617
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stack ["build", "acme-missiles-0.3"]
diff --git a/tests/integration/tests/617-unused-flag-cli/Main.hs b/tests/integration/tests/617-unused-flag-cli/Main.hs
index 0170e4148f..f1123b1794 100644
--- a/tests/integration/tests/617-unused-flag-cli/Main.hs
+++ b/tests/integration/tests/617-unused-flag-cli/Main.hs
@@ -4,7 +4,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/617
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/617-unused-flag-cli/files/package.yaml b/tests/integration/tests/617-unused-flag-cli/files/package.yaml
index b20cb3407d..a7305a77cf 100644
--- a/tests/integration/tests/617-unused-flag-cli/files/package.yaml
+++ b/tests/integration/tests/617-unused-flag-cli/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/Main.hs b/tests/integration/tests/617-unused-flag-name-yaml/Main.hs
index 5fabddaa78..576cea322d 100644
--- a/tests/integration/tests/617-unused-flag-name-yaml/Main.hs
+++ b/tests/integration/tests/617-unused-flag-name-yaml/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/617
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stackErr ["build"]
diff --git a/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml b/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml
index b20cb3407d..a7305a77cf 100644
--- a/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml
+++ b/tests/integration/tests/617-unused-flag-name-yaml/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
diff --git a/tests/integration/tests/617-unused-flag-yaml/Main.hs b/tests/integration/tests/617-unused-flag-yaml/Main.hs
index 609efaadd3..0d928514db 100644
--- a/tests/integration/tests/617-unused-flag-yaml/Main.hs
+++ b/tests/integration/tests/617-unused-flag-yaml/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/617
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = stackErr ["build"]
diff --git a/tests/integration/tests/617-unused-flag-yaml/files/package.yaml b/tests/integration/tests/617-unused-flag-yaml/files/package.yaml
index b20cb3407d..a7305a77cf 100644
--- a/tests/integration/tests/617-unused-flag-yaml/files/package.yaml
+++ b/tests/integration/tests/617-unused-flag-yaml/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml
index 5d83a066f5..e9e6a1b866 100644
--- a/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-test/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: failing-package-with-test
-version: 0.1.0.0
 description: A package with a test suite that is incomplete if sdist.
 
 dependencies:
diff --git a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml
index f9a9959604..0cc7c6c00f 100644
--- a/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml
+++ b/tests/integration/tests/717-sdist-test/files/failing-package-with-th/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: failing-package-with-th
-version: 0.1.0.0
 description: A package with Template Haskell that is incomplete if sdist.
 
 extra-source-files:
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml
index 62ab378b6e..32ba13e69e 100644
--- a/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/dependent-on-failing-packages/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: dependent-on-failing-packages
-version: 0.1.0.0
 description: A package that can be sdist that depends on packages that cannot
 
 extra-source-files:
diff --git a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml
index 0109b121c9..265fa029cd 100644
--- a/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml
+++ b/tests/integration/tests/717-sdist-test/files/subdirs/failing-in-subdir/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: failing-in-subdir
-version: 0.1.0.0
 description: A package with Template Haskell that is incomplete if sdist.
 
 extra-source-files:
diff --git a/tests/integration/tests/763-buildable-false/Main.hs b/tests/integration/tests/763-buildable-false/Main.hs
index c8e7b28d40..4e0cb8c2ac 100644
--- a/tests/integration/tests/763-buildable-false/Main.hs
+++ b/tests/integration/tests/763-buildable-false/Main.hs
@@ -3,7 +3,7 @@
 --
 -- https://github.com/commercialhaskell/stack/issues/763
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/763-buildable-false/files/package.yaml b/tests/integration/tests/763-buildable-false/files/package.yaml
index ef84df9c46..1d512e9811 100644
--- a/tests/integration/tests/763-buildable-false/files/package.yaml
+++ b/tests/integration/tests/763-buildable-false/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 flags:
   buildable:
diff --git a/tests/integration/tests/796-ghc-options/Main.hs b/tests/integration/tests/796-ghc-options/Main.hs
index 0b5bb1cfdb..4842cdc38b 100644
--- a/tests/integration/tests/796-ghc-options/Main.hs
+++ b/tests/integration/tests/796-ghc-options/Main.hs
@@ -3,7 +3,7 @@
 --
 -- See: https://github.com/commercialhaskell/stack/issues/796
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/796-ghc-options/files/package.yaml b/tests/integration/tests/796-ghc-options/files/package.yaml
index b20cb3407d..a7305a77cf 100644
--- a/tests/integration/tests/796-ghc-options/files/package.yaml
+++ b/tests/integration/tests/796-ghc-options/files/package.yaml
@@ -1,7 +1,6 @@
 spec-version: 0.36.0
 
 name: myPackage
-version: 0.1.0.0
 
 dependencies:
 - base
diff --git a/tests/integration/tests/build-ghc/Main.hs b/tests/integration/tests/build-ghc/Main.hs
index 2d533a4c18..3a389a2b7d 100644
--- a/tests/integration/tests/build-ghc/Main.hs
+++ b/tests/integration/tests/build-ghc/Main.hs
@@ -1,5 +1,5 @@
-import StackTest
-import System.Directory (withCurrentDirectory)
+import           StackTest
+import           System.Directory ( withCurrentDirectory )
 
 main :: IO ()
 main = superslow $ do
diff --git a/tests/integration/tests/copy-bins-works/Main.hs b/tests/integration/tests/copy-bins-works/Main.hs
index d22b31fe8e..feafc1ba33 100644
--- a/tests/integration/tests/copy-bins-works/Main.hs
+++ b/tests/integration/tests/copy-bins-works/Main.hs
@@ -1,7 +1,7 @@
 -- | Stack's build command supports the copy-bins flag.
 
-import StackTest
-import System.Directory ( createDirectoryIfMissing )
+import           StackTest
+import           System.Directory ( createDirectoryIfMissing )
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/cyclic-test-deps/Main.hs b/tests/integration/tests/cyclic-test-deps/Main.hs
index 80dab5b758..afc53ad304 100644
--- a/tests/integration/tests/cyclic-test-deps/Main.hs
+++ b/tests/integration/tests/cyclic-test-deps/Main.hs
@@ -1,4 +1,4 @@
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do
diff --git a/tests/integration/tests/module-added-multiple-times/Main.hs b/tests/integration/tests/module-added-multiple-times/Main.hs
index 1cb5324fff..095b1af3fb 100644
--- a/tests/integration/tests/module-added-multiple-times/Main.hs
+++ b/tests/integration/tests/module-added-multiple-times/Main.hs
@@ -1,7 +1,7 @@
 -- | Stack can load a package into GHC's repl.
 
-import Control.Monad ( when )
-import StackTest.Repl
+import           Control.Monad ( when )
+import           StackTest.Repl
 
 main :: IO ()
 main = stackRepl [] $ do
diff --git a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
index eb84b525d1..60cd2526ad 100644
--- a/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
+++ b/tests/integration/tests/stackage-3185-ignore-bounds-in-snapshot/Main.hs
@@ -17,7 +17,7 @@
 -- `--dry-run` to succeed. But if we do this via `extra-deps`, we want it
 -- to fail.
 
-import StackTest
+import           StackTest
 
 main :: IO ()
 main = do