diff --git a/libio/Makefile b/libio/Makefile
index 6a507b67ea..59f3ee0b7c 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -95,6 +95,7 @@ tests = \
   tst-eof \
   tst-ext \
   tst-ext2 \
+  tst-fclose-unopened \
   tst-fdopen-seek-failure \
   tst-fgetc-after-eof \
   tst-fgetwc \
diff --git a/libio/tst-fclose-unopened.c b/libio/tst-fclose-unopened.c
new file mode 100644
index 0000000000..1f1cad042d
--- /dev/null
+++ b/libio/tst-fclose-unopened.c
@@ -0,0 +1,40 @@
+/* Test using fclose on an unopened file.
+   Copyright (C) 2024 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+#include <support/check.h>
+
+/* Verify that fclose on an unopened file returns EOF.  This is not part
+   of the fclose external contract but there are dependancies on this
+   behaviour.  */
+
+static int
+do_test (void)
+{
+  TEST_COMPARE (fclose (stdin), 0);
+
+  /* Attempt to close the unopened file and verify that EOF is returned.
+     Calling fclose on a file twice normally causes a use-after-free bug,
+     however the standard streams are an exception since they are not
+     deallocated by fclose.  */
+  TEST_COMPARE (fclose (stdin), EOF);
+
+  return 0;
+}
+
+#include <support/test-driver.c>