diff --git a/mysql-test/suite/innodb/r/innodb-index,debug.rdiff b/mysql-test/suite/innodb/r/innodb-index,debug.rdiff
new file mode 100644
index 00000000000..2740e440cd5
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innodb-index,debug.rdiff
@@ -0,0 +1,10 @@
+--- innodb-index.result
++++ innodb-index.reject
+@@ -1851,6 +1851,7 @@
+ #
+ # MDEV-15325 Incomplete validation of missing tablespace during recovery
+ #
++SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus';
+ CREATE TABLE t1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
+ CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
+ # Kill the server
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result
index 4a9f9de352c..df27769b810 100644
--- a/mysql-test/suite/innodb/r/innodb-index.result
+++ b/mysql-test/suite/innodb/r/innodb-index.result
@@ -1851,7 +1851,6 @@ drop table t1;
 #
 # MDEV-15325 Incomplete validation of missing tablespace during recovery
 #
-SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus';
 CREATE TABLE t1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 # Kill the server
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index 99f0cfdba86..97014d84ca7 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1,6 +1,7 @@
 -- source include/have_innodb.inc
 # Embedded server tests do not support restarting.
 -- source include/not_embedded.inc
+-- source include/maybe_debug.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 
@@ -1084,7 +1085,9 @@ drop table t1;
 --echo #
 
 --source include/no_checkpoint_start.inc
+if ($have_debug) {
 SET GLOBAL DEBUG_DBUG='+d,fil_names_write_bogus';
+}
 CREATE TABLE t1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 
 CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;