diff --git a/mysql-test/lib/My/Config.pm b/mysql-test/lib/My/Config.pm
index 35273f08cf7..f8416e3df3a 100644
--- a/mysql-test/lib/My/Config.pm
+++ b/mysql-test/lib/My/Config.pm
@@ -27,6 +27,16 @@ sub value {
   return $self->{value};
 }
 
+sub option {
+  my ($self)= @_;
+  my $name=  $self->{name};
+  my $value= $self->{value};
+
+  my $opt= $name;
+  $opt= "$name=$value" if ($value);
+  $opt= "--$opt" unless ($opt =~ /^--/);
+  return $opt;
+}
 
 package My::Config::Group;
 
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 93236e483a1..fd3c9a8c00f 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -397,7 +397,7 @@ sub collect_one_suite($)
 	my $comb= {};
 	$comb->{name}= $group->name();
         foreach my $option ( $group->options() ) {
-	  push(@{$comb->{comb_opt}}, $option->name()."=".$option->value());
+	  push(@{$comb->{comb_opt}}, $option->option());
 	}
 	push(@combinations, $comb);
       }
diff --git a/mysql-test/suite/binlog/combinations b/mysql-test/suite/binlog/combinations
index ea25611a5d4..07042c2cbec 100644
--- a/mysql-test/suite/binlog/combinations
+++ b/mysql-test/suite/binlog/combinations
@@ -1,8 +1,8 @@
 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed
diff --git a/mysql-test/suite/bugs/combinations b/mysql-test/suite/bugs/combinations
index ea25611a5d4..07042c2cbec 100644
--- a/mysql-test/suite/bugs/combinations
+++ b/mysql-test/suite/bugs/combinations
@@ -1,8 +1,8 @@
 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed
diff --git a/mysql-test/suite/rpl/combinations b/mysql-test/suite/rpl/combinations
index ea25611a5d4..07042c2cbec 100644
--- a/mysql-test/suite/rpl/combinations
+++ b/mysql-test/suite/rpl/combinations
@@ -1,8 +1,8 @@
 [row]
---binlog-format=row
+binlog-format=row
 
 [stmt]
---binlog-format=statement
+binlog-format=statement
 
 [mix]
---binlog-format=mixed
+binlog-format=mixed