diff --git a/mysql-test/r/max_prepared_stmt_count_func.result b/mysql-test/r/max_prepared_stmt_count_func.result
index 94ab5437e81..562ef63f811 100644
--- a/mysql-test/r/max_prepared_stmt_count_func.result
+++ b/mysql-test/r/max_prepared_stmt_count_func.result
@@ -78,4 +78,5 @@ DROP PREPARE stmt;
 DROP PREPARE stmt1;
 DROP PREPARE stmt2;
 DROP PREPARE stmt3;
+DROP PROCEDURE sp_checkstmts;
 SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count;
diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/t/character_set_client_basic.test
index f07e9407047..69e4c07dcd8 100644
--- a/mysql-test/t/character_set_client_basic.test
+++ b/mysql-test/t/character_set_client_basic.test
@@ -26,7 +26,6 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
 --source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
diff --git a/mysql-test/t/character_set_connection_basic.test b/mysql-test/t/character_set_connection_basic.test
index b300c8c827e..509f8d0d346 100644
--- a/mysql-test/t/character_set_connection_basic.test
+++ b/mysql-test/t/character_set_connection_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 ###################################################
diff --git a/mysql-test/t/character_set_database_basic.test b/mysql-test/t/character_set_database_basic.test
index 5fbba83dffd..9690fb84b5a 100644
--- a/mysql-test/t/character_set_database_basic.test
+++ b/mysql-test/t/character_set_database_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 ###################################################
diff --git a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/t/character_set_filesystem_basic.test
index 37f06e886f1..0117145a06b 100644
--- a/mysql-test/t/character_set_filesystem_basic.test
+++ b/mysql-test/t/character_set_filesystem_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 
diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/t/character_set_results_basic.test
index 71f8d7d5e7b..aae05c824d1 100644
--- a/mysql-test/t/character_set_results_basic.test
+++ b/mysql-test/t/character_set_results_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 ################################################
diff --git a/mysql-test/t/character_set_server_basic.test b/mysql-test/t/character_set_server_basic.test
index 985ff8d220a..2b3c078363a 100644
--- a/mysql-test/t/character_set_server_basic.test
+++ b/mysql-test/t/character_set_server_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 
diff --git a/mysql-test/t/collation_connection_basic.test b/mysql-test/t/collation_connection_basic.test
index f1551b2a046..f3544dd306e 100644
--- a/mysql-test/t/collation_connection_basic.test
+++ b/mysql-test/t/collation_connection_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 
diff --git a/mysql-test/t/collation_database_basic.test b/mysql-test/t/collation_database_basic.test
index c1c520647f5..c130e276084 100644
--- a/mysql-test/t/collation_database_basic.test
+++ b/mysql-test/t/collation_database_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 
diff --git a/mysql-test/t/collation_server_basic.test b/mysql-test/t/collation_server_basic.test
index 8e4d3fd83e7..c4b469007e5 100644
--- a/mysql-test/t/collation_server_basic.test
+++ b/mysql-test/t/collation_server_basic.test
@@ -26,7 +26,7 @@
 --source include/have_ujis.inc
 --source include/have_sjis.inc
 --source include/have_utf8.inc
---source include/have_uds.inc
+--source include/have_ucs2.inc
 
 --source include/load_sysvars.inc
 
diff --git a/mysql-test/t/div_precision_increment_func.test b/mysql-test/t/div_precision_increment_func.test
index 495273cf1a0..ae2862df2cf 100644
--- a/mysql-test/t/div_precision_increment_func.test
+++ b/mysql-test/t/div_precision_increment_func.test
@@ -19,6 +19,7 @@
 #                                                                              #
 ################################################################################
 
+SET @save_div_precision_increment = @@global.div_presision_increment;
 
 --disable_warnings
 drop table if exists t1;
@@ -118,7 +119,7 @@ drop table t1;
 disconnect test_con1;
 disconnect test_con2;
 
-
+SET @@global.div_prescision_increment = @save_div_precision_increment;
 
 
 
diff --git a/mysql-test/t/ssl_ca_basic.test b/mysql-test/t/ssl_ca_basic.test
index bca463b97c5..c369f1f0894 100644
--- a/mysql-test/t/ssl_ca_basic.test
+++ b/mysql-test/t/ssl_ca_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
---source include/have_ssl.inc
+-- source include/have_ssl.inc
 
 --echo '#---------------------BS_STVARS_045_01----------------------#'
 ####################################################################
diff --git a/mysql-test/t/ssl_cert_basic.test b/mysql-test/t/ssl_cert_basic.test
index c15380609df..c3b69bd495f 100644
--- a/mysql-test/t/ssl_cert_basic.test
+++ b/mysql-test/t/ssl_cert_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
---source include/have_ssl.inc
+-- source include/have_ssl.inc
 
 --echo '#---------------------BS_STVARS_047_01----------------------#'
 ####################################################################
diff --git a/mysql-test/t/ssl_key_basic.test b/mysql-test/t/ssl_key_basic.test
index 12b19a802d5..4616f281c27 100644
--- a/mysql-test/t/ssl_key_basic.test
+++ b/mysql-test/t/ssl_key_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
---source include/have_ssl.inc
+-- source include/have_ssl.inc
 
 --echo '#---------------------BS_STVARS_049_01----------------------#'
 ####################################################################