diff --git a/mysql-test/r/filesort_debug.result b/mysql-test/r/filesort_debug.result
index 13912ac8756..703ae999c64 100644
--- a/mysql-test/r/filesort_debug.result
+++ b/mysql-test/r/filesort_debug.result
@@ -7,7 +7,7 @@ INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5);
 SET session debug_dbug= '+d,alloc_sort_buffer_fail';
 CALL mtr.add_suppression("Out of sort memory");
 SELECT * FROM t1 ORDER BY f1 ASC, f0;
-ERROR HY001: Out of sort memory, consider increasing server sort buffer size
+Got one of the listed errors
 SET session debug_dbug= @old_debug;
 CREATE FUNCTION f1() RETURNS INT RETURN 1;
 DELETE FROM t1 ORDER BY (f1(10)) LIMIT 1;
diff --git a/mysql-test/t/filesort_debug.test b/mysql-test/t/filesort_debug.test
index c375334ad29..bf9e9ca3ed2 100644
--- a/mysql-test/t/filesort_debug.test
+++ b/mysql-test/t/filesort_debug.test
@@ -13,7 +13,7 @@ INSERT INTO t1(f1) VALUES (0),(1),(2),(3),(4),(5);
 
 SET session debug_dbug= '+d,alloc_sort_buffer_fail';
 CALL mtr.add_suppression("Out of sort memory");
---error ER_OUT_OF_SORTMEMORY
+--error ER_OUT_OF_SORTMEMORY,ER_OUT_OF_RESOURCES
 SELECT * FROM t1 ORDER BY f1 ASC, f0;
 SET session debug_dbug= @old_debug;