diff --git a/mysql-test/suite/versioning/t/rpl.test b/mysql-test/suite/versioning/t/rpl.test
index 2f95fd1928c..de8cfddd14a 100644
--- a/mysql-test/suite/versioning/t/rpl.test
+++ b/mysql-test/suite/versioning/t/rpl.test
@@ -1,18 +1,6 @@
---source include/master-slave.inc
-
-if ($MTR_COMBINATION_STMT)
-{
-  --source include/have_binlog_format_statement.inc
-}
-if ($MTR_COMBINATION_ROW)
-{
-  --source include/have_binlog_format_row.inc
-}
-if ($MTR_COMBINATION_MIX)
-{
-  --source include/have_binlog_format_mixed.inc
-}
+--source include/have_binlog_format_mixed_or_statement.inc
 --source suite/versioning/engines.inc
+--source include/master-slave.inc
 
 #BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
 #Testing command counters -BEFORE.
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index f10a5e51b59..a86d40580db 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -6197,6 +6197,9 @@ int THD::decide_logging_format(TABLE_LIST *tables)
         flags_write_some_set |= flags;
         is_write= TRUE;
 
+        if (table->table->versioned())
+          flags_write_all_set &= HA_BINLOG_STMT_CAPABLE;
+
         prev_write_table= table->table;
 
       }