diff --git a/arion-compose.cabal b/arion-compose.cabal
index b0e56e8..1637b44 100644
--- a/arion-compose.cabal
+++ b/arion-compose.cabal
@@ -34,6 +34,9 @@ common deps
                    , text
                    , protolude
 
+flag ghci
+  default: False
+  manual: True
 
 library
   import:              deps
@@ -56,6 +59,9 @@ executable arion
 
 test-suite arion-unit-tests
   import:              deps
+  if flag(ghci)
+    hs-source-dirs:      src/haskell/lib
+    ghc-options:       -Wno-missing-home-modules
   type:                exitcode-stdio-1.0
   main-is:             TestMain.hs
   -- other-modules:
diff --git a/live-unit-tests b/live-unit-tests
index 09e3af9..4f70f27 100755
--- a/live-unit-tests
+++ b/live-unit-tests
@@ -6,7 +6,7 @@ set -eux -o pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
 ghcid \
-  --command 'ghci -isrc/haskell/exe -isrc/haskell/lib -isrc/haskell/test src/haskell/test/TestMain.hs' \
+  --command 'cabal v2-repl arion-compose:arion-unit-tests --flags ghci --write-ghc-environment-files=never' \
   --test=Main.main \
   --reload=src/haskell \
   --restart=hercules-ci-api.cabal \