diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result
index fbb84a677cf..68a667f6d95 100644
--- a/mysql-test/r/myisam.result
+++ b/mysql-test/r/myisam.result
@@ -395,3 +395,11 @@ concat(a,'.')
 aaa.
 aaa   .
 drop table t1;
+create table t1(a text not null, b text not null, c text not null, index (a(10),b(10),c(10)));
+insert into t1 values('807780', '477', '165');
+insert into t1 values('807780', '477', '162');
+insert into t1 values('807780', '472', '162');
+select * from t1 where a='807780' and b='477' and c='165';
+a	b	c
+807780	477	165
+drop table t1;
diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index 45d20a8fced..e87df9a6c24 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -300,11 +300,3 @@ SELECT COUNT(*) FROM t1 WHERE (c=0 and b=1) or (c=0 and a=1);
 COUNT(*)
 6
 DROP TABLE t1;
-create table t1(a text not null, b text not null, c text not null, index (a(10),b(10),c(10)));
-insert into t1 values('807780', '477', '165');
-insert into t1 values('807780', '477', '162');
-insert into t1 values('807780', '472', '162');
-select * from t1 where a='807780' and b='477' and c='165';
-a	b	c
-807780	477	165
-drop table t1;
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 25bb76ceaba..394261aae40 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -395,3 +395,14 @@ repair table t1;
 select concat(a,'.') from t1 where a='aaa';
 drop table t1;
 
+#
+# Third bug in the same code (BUG#2295)
+#
+
+create table t1(a text not null, b text not null, c text not null, index (a(10),b(10),c(10)));
+insert into t1 values('807780', '477', '165');
+insert into t1 values('807780', '477', '162');
+insert into t1 values('807780', '472', '162');
+select * from t1 where a='807780' and b='477' and c='165';
+drop table t1;
+
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 9d9feaa4edc..b04e614a740 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -249,14 +249,3 @@ SELECT COUNT(*) FROM t1 WHERE (c=0 and a=1) or (c=0 and b=1);
 SELECT COUNT(*) FROM t1 WHERE (c=0 and b=1) or (c=0 and a=1);
 DROP TABLE t1;
 
-#
-# BUG#2295 - range on blob
-#
-
-create table t1(a text not null, b text not null, c text not null, index (a(10),b(10),c(10)));
-insert into t1 values('807780', '477', '165');
-insert into t1 values('807780', '477', '162');
-insert into t1 values('807780', '472', '162');
-select * from t1 where a='807780' and b='477' and c='165';
-drop table t1;
-