diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 695416cf483..71ec4951f16 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-20  Pedro Alves  <pedro@palves.net>
+
+	* gdb.base/testenv.exp (find_env): Bail out if printing 'envp[$i]'
+	fails.
+
 2020-09-19  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/array-slices.exp: Update expected results.
diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp
index 1599b72c27b..4dea043472c 100644
--- a/gdb/testsuite/gdb.base/testenv.exp
+++ b/gdb/testsuite/gdb.base/testenv.exp
@@ -68,6 +68,12 @@ proc find_env {varname} {
 	    -re "var: \(\[^\r\n\]*\)\r\n$gdb_prompt $" {
 		set var $expect_out(1,string)
 	    }
+	    -re "$gdb_prompt $" {
+		# If this fails, bail out, otherwise we get stuck in
+		# an infinite loop.  The caller will end up emiting a
+		# FAIL.
+		return "<fail>"
+	    }
 	}
 
 	if {[string match "$varname=*" $var]} {