diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.out
new file mode 100644
index 00000000000..37aa169b416
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.out
@@ -0,0 +1,2 @@
+# cabal check
+No errors or warnings could be found in the package.
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.test.hs b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.test.hs
new file mode 100644
index 00000000000..856a1aaad81
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/cabal.test.hs
@@ -0,0 +1,4 @@
+import Test.Cabal.Prelude
+
+-- Do not output warning when an -O2 is behind a cabal flag.
+main = cabalTest $ cabal "check" []
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/pkg.cabal b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/pkg.cabal
new file mode 100644
index 00000000000..da87e698285
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlag/pkg.cabal
@@ -0,0 +1,18 @@
+cabal-version: 2.2
+name: pkg
+version: 0
+category: example
+maintainer: none@example.com
+synopsis: synopsys
+description: description
+license: GPL-3.0-or-later
+
+flag force-O2
+  default: False
+  manual: True
+
+library
+  exposed-modules:      Foo
+  default-language:     Haskell2010
+  if flag(force-O2)
+    ghc-options:        -O2
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.out b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.out
new file mode 100644
index 00000000000..b26b8576047
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.out
@@ -0,0 +1,4 @@
+# cabal check
+Warning: These warnings may cause trouble when distributing the package:
+Warning: 'ghc-options: -O2' is rarely needed. Check that it is giving a real benefit and not just imposing longer compile times on your users.
+
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.test.hs b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.test.hs
new file mode 100644
index 00000000000..856a1aaad81
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/cabal.test.hs
@@ -0,0 +1,4 @@
+import Test.Cabal.Prelude
+
+-- Do not output warning when an -O2 is behind a cabal flag.
+main = cabalTest $ cabal "check" []
diff --git a/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/pkg.cabal b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/pkg.cabal
new file mode 100644
index 00000000000..cec9eec5fe9
--- /dev/null
+++ b/cabal-testsuite/PackageTests/Check/ConfiguredPackage/GHCOptions/NoWarnFlagOut/pkg.cabal
@@ -0,0 +1,19 @@
+cabal-version: 2.2
+name: pkg
+version: 0
+category: example
+maintainer: none@example.com
+synopsis: synopsys
+description: description
+license: GPL-3.0-or-later
+
+flag force-O2
+  default: False
+  manual: True
+
+library
+  exposed-modules:      Foo
+  default-language:     Haskell2010
+  ghc-options:          -O2
+  if flag(force-O2)
+    ghc-options:        -O2