diff --git a/mysql-test/r/create_or_replace.result b/mysql-test/r/create_or_replace.result
index 0403e1a0a3585..6e86dea3f9c90 100644
--- a/mysql-test/r/create_or_replace.result
+++ b/mysql-test/r/create_or_replace.result
@@ -435,8 +435,8 @@ CREATE TABLE t1 (col_int_nokey INT)  ENGINE=InnoDB;
 CREATE OR REPLACE TEMPORARY TABLE tmp LIKE t1;
 LOCK TABLE t1 WRITE;
 CREATE OR REPLACE TABLE t1 LIKE tmp;;
-KILL QUERY 3;
+KILL QUERY con_id;
 CREATE OR REPLACE TABLE t1 (a int);;
-KILL QUERY 3;
+KILL QUERY con_id;
 drop table t1;
 DROP TABLE t2;
diff --git a/mysql-test/t/create_or_replace.test b/mysql-test/t/create_or_replace.test
index c7b980f9107f7..02d96a5211470 100644
--- a/mysql-test/t/create_or_replace.test
+++ b/mysql-test/t/create_or_replace.test
@@ -348,6 +348,7 @@ LOCK TABLE t1 WRITE;
 --connection default
 --send CREATE OR REPLACE TABLE t1 LIKE tmp;
 --connection con1
+--replace_result $con_id con_id
 eval KILL QUERY $con_id;
 
 --connection default
@@ -356,6 +357,7 @@ eval KILL QUERY $con_id;
 --send CREATE OR REPLACE TABLE t1 (a int);
 
 --connection con1
+--replace_result $con_id con_id
 eval KILL QUERY $con_id;
 
 --connection default
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
index 584a657f01eb5..e217ad38fd2a1 100644
--- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_lock_waits_released.test
@@ -1,7 +1,7 @@
 # verify that information_schema.tokudb_locks gets populated with locks, information_schema.tokudb_lock_waits gets
-if (`select @@tokudb_version <= "7.1.7"`)
+if (`select @@tokudb_version <= "7.1.8"`)
 {
-  --skip Race condition in the test in TokuDB 7.1.7 or earlier
+  --skip Race condition in the test in TokuDB 7.1.8 or earlier
 }
 # populated with 1 lock_wait and all transactions are present in information_schema.tokudb_trx for 2 clients
 
diff --git a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
index eac0f6da41829..6df23e7edb3ad 100644
--- a/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
+++ b/storage/tokudb/mysql-test/tokudb/t/i_s_tokudb_locks_released.test
@@ -1,6 +1,6 @@
-if (`select @@tokudb_version <= "7.1.7"`)
+if (`select @@tokudb_version <= "7.1.8"`)
 {
-  --skip Race condition in the test in TokuDB 7.1.7 or earlier
+  --skip Race condition in the test in TokuDB 7.1.8 or earlier
 }
 # verify that information_schema.tokudb_locks gets populated with locks for 2 clients