diff --git a/.gitignore b/.gitignore
index fac63999a..7ea95539c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-local/
-out/
+/local/
+/out/
 .build
 .stack-root
 .stack-work
diff --git a/Pinafore/pinafore-app/app/main/Test.hs b/Pinafore/pinafore-app/app/main/Test.hs
index b810736a8..07f593a3a 100644
--- a/Pinafore/pinafore-app/app/main/Test.hs
+++ b/Pinafore/pinafore-app/app/main/Test.hs
@@ -88,7 +88,7 @@ testOptionParsing =
 
 testOptionHelp :: TestTree
 testOptionHelp =
-    testHandleVsFileInDir ("test" </> "golden") "option-help" $ \h -> do
+    testHandleVsFileInDir ("app/main/test") "option-help" $ \h -> do
         let pr = execParserPure defaultPrefs optParserInfo ["--help"]
         case pr of
             Failure (ParserFailure f) ->
diff --git a/Pinafore/pinafore-app/test/golden/.gitignore b/Pinafore/pinafore-app/app/main/test/.gitignore
similarity index 100%
rename from Pinafore/pinafore-app/test/golden/.gitignore
rename to Pinafore/pinafore-app/app/main/test/.gitignore
diff --git a/Pinafore/pinafore-app/test/golden/option-help.ref b/Pinafore/pinafore-app/app/main/test/option-help.ref
similarity index 100%
rename from Pinafore/pinafore-app/test/golden/option-help.ref
rename to Pinafore/pinafore-app/app/main/test/option-help.ref
diff --git a/Pinafore/pinafore-app/test/out/.gitignore b/Pinafore/pinafore-app/test/out/.gitignore
new file mode 100644
index 000000000..f47cb2045
--- /dev/null
+++ b/Pinafore/pinafore-app/test/out/.gitignore
@@ -0,0 +1 @@
+*.out