diff --git a/mysql-test/r/innodb-lock.result b/mysql-test/r/innodb-lock.result
index 407a85ed038..4ace4065c34 100644
--- a/mysql-test/r/innodb-lock.result
+++ b/mysql-test/r/innodb-lock.result
@@ -1,3 +1,4 @@
+set global innodb_table_locks=1;
 select @@innodb_table_locks;
 @@innodb_table_locks
 1
diff --git a/mysql-test/t/innodb-lock-master.opt b/mysql-test/t/innodb-lock-master.opt
deleted file mode 100644
index 403fcde87ed..00000000000
--- a/mysql-test/t/innodb-lock-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb-table-lock=1
diff --git a/mysql-test/t/innodb-lock.test b/mysql-test/t/innodb-lock.test
index 430369f4fda..a3b6f8993f2 100644
--- a/mysql-test/t/innodb-lock.test
+++ b/mysql-test/t/innodb-lock.test
@@ -4,6 +4,8 @@
 # Check and select innodb lock type
 #
 
+set global innodb_table_locks=1;
+
 select @@innodb_table_locks;
 
 #
@@ -12,7 +14,10 @@ select @@innodb_table_locks;
 
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
+
+--disable_warnings
 drop table if exists t1;
+--enable_warnings
 
 #
 # Testing of explicit table locks with enforced table locks