diff --git a/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Setup.hs b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Setup.hs
new file mode 100644
index 00000000000..e8ef27dbba9
--- /dev/null
+++ b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Setup.hs
@@ -0,0 +1,3 @@
+import Distribution.Simple
+
+main = defaultMain
diff --git a/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Simple.hs b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Simple.hs
new file mode 100644
index 00000000000..df38c448c5e
--- /dev/null
+++ b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/Simple.hs
@@ -0,0 +1,4 @@
+module Simple where
+
+-- | For hiding needles.
+data Haystack = Haystack
diff --git a/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.project b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.project
new file mode 100644
index 00000000000..f45d5a19d3c
--- /dev/null
+++ b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.project
@@ -0,0 +1,3 @@
+packages: .
+
+haddock-keep-temp-files: true
diff --git a/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.test.hs b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.test.hs
new file mode 100644
index 00000000000..15c39a0e4e9
--- /dev/null
+++ b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/cabal.test.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE LambdaCase #-}
+
+import Test.Cabal.Prelude
+
+-- Test that "cabal haddock" preserves temporary files
+-- We use haddock-keep-temp-file: True in the cabal.project.
+main = cabalTest $ recordMode DoNotRecord $ withProjectFile "cabal.project" $ do
+  cabal "haddock" []
+
+  -- Check that there is a response file.
+  responseFiles <- assertGlobMatchesTestDir testDistDir "**/haddock-response*.txt"
+
+  -- Check that the matched response file is not empty, and is indeed a Haddock
+  -- response file.
+  assertAnyFileDoesContain responseFiles "--package-name"
diff --git a/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/my.cabal b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/my.cabal
new file mode 100644
index 00000000000..a4a24980c12
--- /dev/null
+++ b/cabal-testsuite/PackageTests/HaddockKeepTmpsCustom/my.cabal
@@ -0,0 +1,16 @@
+cabal-version: 3.0
+name: HaddockKeepsTmpsCustom
+version: 0.1
+license: BSD-3-Clause
+author: Rodrigo Mesquita
+stability: stable
+category: PackageTests
+build-type: Custom
+
+custom-setup
+    setup-depends: Cabal, base
+
+library
+    default-language: Haskell2010
+    exposed-modules: Simple
+    build-depends: base