diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
index 03be110f59d..75061add962 100644
--- a/mysql-test/lib/My/ConfigFactory.pm
+++ b/mysql-test/lib/My/ConfigFactory.pm
@@ -627,7 +627,7 @@ sub new_config {
 		  }, $class;
 
   # add auto-options
-  $config->insert('OPT', 'port'   => sub { fix_port($self, $config) });
+  # $config->insert('OPT', 'port'   => sub { fix_port($self, $config) });
   $config->insert('OPT', 'vardir' => sub { $self->{ARGS}->{vardir} });
 
   {
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 35ba930d5a4..5f557ef5d99 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -91,15 +91,16 @@ sub init_pattern {
 
 sub testcase_sort_order {
   my ($a, $b, $sort_criteria)= @_;
-  my $a_sort_criteria= $sort_criteria->{$a->fullname()};
-  my $b_sort_criteria= $sort_criteria->{$b->fullname()};
-  my $res= $a_sort_criteria cmp $b_sort_criteria;
-  return $res if $res;
   # Run slow tests first, trying to avoid getting stuck at the end
   # with a slow test in one worker and the other workers idle.
   return -1 if $a->{'long_test'} && !$b->{'long_test'};
   return 1 if !$a->{'long_test'} && $b->{'long_test'};
 
+  my $a_sort_criteria= $sort_criteria->{$a->fullname()};
+  my $b_sort_criteria= $sort_criteria->{$b->fullname()};
+  my $res= $a_sort_criteria cmp $b_sort_criteria;
+  return $res if $res;
+
   return $a->fullname() cmp $b->fullname();
 }
 
@@ -915,6 +916,11 @@ sub collect_one_test_case {
     $tinfo->{'comment'}= "Test needs --big-test";
     return $tinfo
   }
+  if ( $tinfo->{'big_test'} )
+  {
+    # All 'big_test' takes a long time to run
+    $tinfo->{'long_test'}= 1;
+  }
 
   if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
   {
diff --git a/mysql-test/suite/federated/federated_server.result b/mysql-test/suite/federated/federated_server.result
index 05782c6ef81..2c1dd96d612 100644
--- a/mysql-test/suite/federated/federated_server.result
+++ b/mysql-test/suite/federated/federated_server.result
@@ -54,7 +54,7 @@ PASSWORD '',
 PORT SLAVE_PORT,
 SOCKET '',
 OWNER 'root');
-select * from mysql.servers;
+select * from mysql.servers order by db;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
 server_one	127.0.0.1	first_db	root		SLAVE_PORT		mysql	root
 server_two	127.0.0.1	second_db	root		SLAVE_PORT		mysql	root
@@ -154,7 +154,7 @@ id	name
 drop table federated.t1;
 drop server 'server_one';
 drop server 'server_two';
-select * from mysql.servers;
+select * from mysql.servers order by db;
 Server_name	Host	Db	Username	Password	Port	Socket	Wrapper	Owner
 drop table first_db.t1;
 drop table second_db.t1;
diff --git a/mysql-test/suite/federated/federated_server.test b/mysql-test/suite/federated/federated_server.test
index d03c2d26014..ba1df04b62f 100644
--- a/mysql-test/suite/federated/federated_server.test
+++ b/mysql-test/suite/federated/federated_server.test
@@ -66,7 +66,7 @@ eval create server 'server_two' foreign data wrapper 'mysql' options
   OWNER 'root');
 
 --replace_result $SLAVE_MYPORT SLAVE_PORT
-eval select * from mysql.servers;
+eval select * from mysql.servers order by db;
 
 DROP TABLE IF EXISTS federated.old;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
@@ -151,7 +151,7 @@ drop table federated.t1;
 
 drop server 'server_one';
 drop server 'server_two';
-select * from mysql.servers;
+select * from mysql.servers order by db;
 
 connection slave;
 drop table first_db.t1;