diff --git a/.gitignore b/.gitignore
index e9ec3b6322f..d7b51e1cfbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,6 @@ bench.html
 
 # Emacs
 .projectile
+
+# I'm unsure how to ignore these generated golden files
+cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.out
diff --git a/cabal-testsuite/PackageTests/Get/OnlyDescription/cabal.test.hs b/cabal-testsuite/PackageTests/Get/OnlyDescription/cabal.test.hs
index 3b4a36553c7..359d29a33de 100644
--- a/cabal-testsuite/PackageTests/Get/OnlyDescription/cabal.test.hs
+++ b/cabal-testsuite/PackageTests/Get/OnlyDescription/cabal.test.hs
@@ -9,3 +9,4 @@ main = cabalTest $ withRepo "repo" $ do
   cabal
     "get"
     [ "criterion", "--only-package-description" ]
+  void (shell "rm" ["criterion-1.1.4.0.cabal"])
diff --git a/cabal-testsuite/PackageTests/Get/T7248/cabal.out b/cabal-testsuite/PackageTests/Get/T7248/cabal.out
index 0c6e3ce035c..a172b425d4d 100644
--- a/cabal-testsuite/PackageTests/Get/T7248/cabal.out
+++ b/cabal-testsuite/PackageTests/Get/T7248/cabal.out
@@ -1,6 +1,4 @@
 # cabal get
 Warning: <ROOT>/cabal.config: Unrecognized stanza on line 3
-Warning: The package list for 'repo.invalid' does not exist. Run 'cabal update' to download it.
-Error: [Cabal-7100]
-There is no package named 'a-b-s-e-n-t'. 
-You may need to run 'cabal update' to get the latest list of available packages.
+Error: [Cabal-7160]
+The package list for 'repo.invalid' does not exist. Run 'cabal update' to download it.
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.out.in b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.out.in
new file mode 100644
index 00000000000..7e39d252dfd
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.out.in
@@ -0,0 +1,19 @@
+# cabal update
+Warning: Caught exception during _mirrors lookup:DnsNoData
+Warning: No mirrors found for http://localhost:8000/
+Downloading the latest package list from repository.localhost
+Package list of repository.localhost has been updated.
+The index-state is set to REPLACEME.
+# cabal build
+Error: [Cabal-7159]
+Latest known index-state for 'repository.localhost' (REPLACEME) is older than the requested index-state (4000-01-01T00:00:00Z).
+Run 'cabal update' or set the index-state to a value at or before REPLACEME.
+# cabal build
+Warning: There is no index-state for 'repository.localhost' exactly at the requested timestamp (2023-01-01T00:00:00Z). Also, there are no index-states before the one requested, so the repository 'repository.localhost' will be empty.
+Resolving dependencies...
+Error: [Cabal-7107]
+Could not resolve dependencies:
+[__0] trying: fake-pkg-1.0 (user goal)
+[__1] unknown package: pkg (dependency of fake-pkg)
+[__1] fail (backjumping, conflict set: fake-pkg, pkg)
+After searching the rest of the dependency tree exhaustively, these were the goals I've had most trouble fulfilling: fake-pkg (2), pkg (1)
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.project b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.project
new file mode 100644
index 00000000000..a6de7296b36
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.project
@@ -0,0 +1 @@
+packages: fake-pkg
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.test.hs b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.test.hs
new file mode 100644
index 00000000000..2dc75b76500
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/cabal.test.hs
@@ -0,0 +1,19 @@
+import Test.Cabal.Prelude
+import Data.List
+
+main = cabalTest $ withProjectFile "cabal.project" $ withRemoteRepo "repo" $ do
+  output <- last
+          . words
+          . head
+          . filter ("Index cache updated to index-state " `isPrefixOf`)
+          . lines
+          . resultOutput
+        <$> cabal' "update" []
+  -- update golden output with actual timestamp
+  shell "cp" ["cabal.out.in", "cabal.out"]
+  shell "sed" ["-i''", "-e", "s/REPLACEME/" <> output <> "/g", "cabal.out"]
+  -- This shall fail with an error message as specified in `cabal.out`
+  fails $ cabal "build" ["--index-state=4000-01-01T00:00:00Z", "fake-pkg"]
+  -- This shall fail by not finding the package, what indicates that it
+  -- accepted an older index-state.
+  fails $ cabal "build" ["--index-state=2023-01-01T00:00:00Z", "fake-pkg"]
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/Main.hs b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/Main.hs
new file mode 100644
index 00000000000..e5f1c882aeb
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/Main.hs
@@ -0,0 +1,3 @@
+module Main where
+
+main = print "hello"
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/fake-pkg.cabal b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/fake-pkg.cabal
new file mode 100644
index 00000000000..813542d87f3
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/fake-pkg/fake-pkg.cabal
@@ -0,0 +1,8 @@
+version: 1.0
+name: fake-pkg
+build-type: Simple
+cabal-version: >= 1.2
+
+executable my-exe
+  main-is: Main.hs
+  build-depends: base, pkg
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/Foo.hs b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/Foo.hs
new file mode 100644
index 00000000000..9bb6374ab6c
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/Foo.hs
@@ -0,0 +1,3 @@
+module Foo (someFunc) where
+
+someFunc = "hello"
diff --git a/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/pkg.cabal b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/pkg.cabal
new file mode 100644
index 00000000000..b046359bf55
--- /dev/null
+++ b/cabal-testsuite/PackageTests/NewUpdate/RejectFutureIndexStates/repo/pkg-1.0/pkg.cabal
@@ -0,0 +1,8 @@
+name: pkg
+version: 1.0
+build-type: Simple
+cabal-version: >= 1.2
+
+library
+  exposed-modules: Foo
+  build-depends: base