diff --git a/mysql-test/suite/tokudb.bugs/r/2970.result b/mysql-test/suite/tokudb.bugs/r/2970.result
new file mode 100644
index 00000000000..3998be0d1f0
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/r/2970.result
@@ -0,0 +1,13 @@
+drop table if exists t2970;
+Warnings:
+Note	1051	Unknown table 't2970'
+create table t2970 (a int, b int, c int, d int, key(a), key(a,b)) engine=innodb;
+insert into t2970 values (1,1,1,1),(1,2,3,4);
+explain select a,count(b),max(b) from t2970 where a > 0 group by a order by a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2970	index	a,a_2	a_2	10	NULL	2	Using where; Using index
+alter table t2970 engine=tokudb;
+explain select a,count(b),max(b) from t2970 where a > 0 group by a order by a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2970	index	a,a_2	a_2	10	NULL	2	Using where; Using index
+drop table t2970;
diff --git a/mysql-test/suite/tokudb.bugs/t/2970.test b/mysql-test/suite/tokudb.bugs/t/2970.test
new file mode 100644
index 00000000000..b695a6fad59
--- /dev/null
+++ b/mysql-test/suite/tokudb.bugs/t/2970.test
@@ -0,0 +1,11 @@
+# test that the query planner chooses a covering index over a non-covering index with the same
+# record cost
+
+drop table if exists t2970;
+create table t2970 (a int, b int, c int, d int, key(a), key(a,b)) engine=innodb;
+insert into t2970 values (1,1,1,1),(1,2,3,4);
+explain select a,count(b),max(b) from t2970 where a > 0 group by a order by a;
+alter table t2970 engine=tokudb;
+explain select a,count(b),max(b) from t2970 where a > 0 group by a order by a;
+drop table t2970;
+