diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 870df115f58..e6bd18fc363 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -250,6 +250,7 @@ sub load_suite_object {
   unless (defined $suites{$suitename}) {
     if (-f "$suitedir/suite.pm") {
       $suite= do "$suitedir/suite.pm";
+      mtr_error("Cannot load $suitedir/suite.pm: $@") if $@;
       unless (ref $suite) {
         my $comment = $suite;
         $suite = My::Suite->new();
diff --git a/mysql-test/suite/archive/suite.pm b/mysql-test/suite/archive/suite.pm
index eb2ff9f8e26..e74bd75e9fb 100644
--- a/mysql-test/suite/archive/suite.pm
+++ b/mysql-test/suite/archive/suite.pm
@@ -2,8 +2,8 @@ package My::Suite::Archive;
 
 @ISA = qw(My::Suite);
 
-return ("Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
-        $::mysqld_variables{'archive'} eq "ON");
+return "Need Archive engine" unless $ENV{HA_ARCHIVE_SO} or
+        $::mysqld_variables{'archive'} eq "ON";
 
 bless { };
 
diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result
index a1dbd33ec19..2802cdeb977 100644
--- a/storage/sequence/mysql-test/sequence/simple.result
+++ b/storage/sequence/mysql-test/sequence/simple.result
@@ -262,10 +262,11 @@ commit;
 select count(*) from t1;
 count(*)
 10
-show binlog events from <binlog_start> limit 10;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
-master-bin.000001	#	Query	#	#	use test; insert t1 select * from seq_1_to_10
+master-bin.000001	#	Query	#	#	use `test`; insert t1 select * from seq_1_to_10
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 drop table t1;
 drop table seq_1_to_1;
diff --git a/storage/sequence/mysql-test/sequence/simple.test b/storage/sequence/mysql-test/sequence/simple.test
index 7c76997dddf..fd5b6c6d50c 100644
--- a/storage/sequence/mysql-test/sequence/simple.test
+++ b/storage/sequence/mysql-test/sequence/simple.test
@@ -1,5 +1,5 @@
 --source inc.inc
---source include/have_xtradb.inc
+--source include/have_innodb.inc
 --source include/have_binlog_format_statement.inc
 
 --query_vertical select * from information_schema.engines where engine='sequence'
diff --git a/storage/sequence/mysql-test/sequence/suite.pm b/storage/sequence/mysql-test/sequence/suite.pm
index 3dbf21c5d55..42333bb2870 100644
--- a/storage/sequence/mysql-test/sequence/suite.pm
+++ b/storage/sequence/mysql-test/sequence/suite.pm
@@ -1,4 +1,4 @@
-package My::Suite::Sequence
+package My::Suite::Sequence;
 
 @ISA = qw(My::Suite);
 
diff --git a/storage/test_sql_discovery/mysql-test/sql_discovery/suite.pm b/storage/test_sql_discovery/mysql-test/sql_discovery/suite.pm
index 313e2fdaefc..b60e189f2b0 100644
--- a/storage/test_sql_discovery/mysql-test/sql_discovery/suite.pm
+++ b/storage/test_sql_discovery/mysql-test/sql_discovery/suite.pm
@@ -1,4 +1,4 @@
-package My::Suite::SQL_Discovery
+package My::Suite::SQL_Discovery;
 
 @ISA = qw(My::Suite);