diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 04983ef19ab..da512cd0a4f 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -4398,16 +4398,4 @@ INSERT INTO t1 VALUES (1), (3);
 SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 a	b
 DROP TABLE t1,t2;
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SUM(EXISTS(SELECT RAND() FROM t1))
-0
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-REVERSE(EXISTS(SELECT RAND() FROM t1))
-0
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+End of 5.0 tests.
diff --git a/mysql-test/r/subselect_debug.result b/mysql-test/r/subselect_debug.result
new file mode 100644
index 00000000000..9ba552bbdf7
--- /dev/null
+++ b/mysql-test/r/subselect_debug.result
@@ -0,0 +1,12 @@
+CREATE TABLE t1(id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
+SET SESSION debug="d,subselect_exec_fail";
+SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
+SUM(EXISTS(SELECT RAND() FROM t1))
+0
+SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
+REVERSE(EXISTS(SELECT RAND() FROM t1))
+0
+SET SESSION debug=DEFAULT;
+DROP TABLE t1;
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 08e0f6592ab..d13f6230339 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -3299,18 +3299,4 @@ SELECT * FROM t2 WHERE b NOT IN (SELECT max(t.c) FROM t1, t1 t WHERE t.c>10);
 
 DROP TABLE t1,t2;
 
-#
-# Bug #37627: Killing query with sum(exists()) or avg(exists()) reproducibly
-# crashes server
-#
-
-CREATE TABLE t1(id INT);
-INSERT INTO t1 VALUES (1),(2),(3),(4);
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
-INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c;
-# Setup the mysqld to crash at certain point
-SET SESSION debug="d,subselect_exec_fail";
-SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
-SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
-SET SESSION debug=DEFAULT;
-DROP TABLE t1;
+--echo End of 5.0 tests.
diff --git a/mysql-test/t/subselect_debug.test b/mysql-test/t/subselect_debug.test
new file mode 100644
index 00000000000..358705da4f2
--- /dev/null
+++ b/mysql-test/t/subselect_debug.test
@@ -0,0 +1,16 @@
+--source include/have_debug.inc
+
+#
+# Bug #37627: Killing query with sum(exists()) or avg(exists()) reproducibly
+# crashes server
+#
+
+CREATE TABLE t1(id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+INSERT INTO t1 SELECT a.id FROM t1 a,t1 b,t1 c,t1 d;
+# Setup the mysqld to crash at certain point
+SET SESSION debug="d,subselect_exec_fail";
+SELECT SUM(EXISTS(SELECT RAND() FROM t1)) FROM t1;
+SELECT REVERSE(EXISTS(SELECT RAND() FROM t1));
+SET SESSION debug=DEFAULT;
+DROP TABLE t1;