diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 6f30480d6b1..9ada5dc0784 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -368,8 +368,3 @@ Variable_name	Value
 key_cache_block_size	1536
 SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
 DROP TABLE t1;
-SET @save_key_buffer = @@global.key_buffer_size;
-SET @@global.key_buffer_size = 4294967295;
-SET @@global.key_buffer_size = 9223372036854775807;
-SET @@global.key_buffer_size = @save_key_buffer;
-End of 5.1 tests
diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test
index f588a964584..4c14dc96aaa 100644
--- a/mysql-test/t/key_cache.test
+++ b/mysql-test/t/key_cache.test
@@ -247,28 +247,3 @@ SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
 DROP TABLE t1;
 
 # End of 4.1 tests
-
-#
-# Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash
-#
-
-SET @save_key_buffer = @@global.key_buffer_size;
-
-# Wee try to force Out Of Memory here. key_buffer_size is ULL, so
-# on a 32 bit machine, 4GB is the most we can ask for before the
-# server complains about value/variable mismatch. At the off chance
-# of one of our 64-bit machines actually offering us 4GB, we also
-# accept "no error" (in addition to the expected "out of memory").
---error 0,ER_OUTOFMEMORY
-SET @@global.key_buffer_size = 4294967295;
-
-# on 32-bit, we get "out of range", on 64-bit, "out of memory".
---error 0,ER_WRONG_ARGUMENTS,ER_OUTOFMEMORY
---disable_warnings
-SET @@global.key_buffer_size = 9223372036854775807;
---enable_warnings
-
-# restore normal value, just in case we got the 4GB or something.
-SET @@global.key_buffer_size = @save_key_buffer;
-
---echo End of 5.1 tests