diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 931cc63c513..355846d569b 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3615,13 +3615,14 @@ sub mysqld_arguments ($$$$$) {
     }
   }
 
-  my $pidfile;
+  # Check if "extra_opt" contains --skip-log-bin
+  my $skip_binlog= grep('--skip-log-bin', @$extra_opt);
 
   if ( $type eq 'master' )
   {
     my $id= $idx > 0 ? $idx + 101 : 1;
 
-    if (! $opt_skip_master_binlog)
+    if (! ($opt_skip_master_binlog || $skip_binlog) )
     {
       mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
                   $opt_vardir, $sidx);
@@ -3683,7 +3684,7 @@ sub mysqld_arguments ($$$$$) {
     mtr_add_arg($args, "%s--datadir=%s", $prefix,
                 $slave->[$idx]->{'path_myddir'});
     mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
-    if (! $opt_skip_slave_binlog)
+    if (! ( $opt_skip_slave_binlog || $skip_binlog ))
     {
       mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
                   $opt_vardir, $sidx); # FIXME use own dir for binlogs
@@ -3820,6 +3821,10 @@ sub mysqld_arguments ($$$$$) {
     {
       $found_skip_core= 1;
     }
+    elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
+    {
+      ; # Dont add --binlog-format when running without binlog
+    }
     else
     {
       mtr_add_arg($args, "%s%s", $prefix, $arg);
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 8c2c4740f5e..6354aa11320 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -36,7 +36,6 @@ synchronization          : Bug#24529  	Test 'synchronization' fails on Mac pushb
 #ndb_binlog_discover      : bug#21806 2006-08-24
 #ndb_autodiscover3        : bug#21806
 
-flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin
 mysql_upgrade            : Bug#25074 mysql_upgrade gives inconsisten results
 plugin                   : Bug#25659 memory leak via "plugins" test
 
diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/t/flush2-master.opt
index ccbd01c91d3..789275fa25e 100644
--- a/mysql-test/t/flush2-master.opt
+++ b/mysql-test/t/flush2-master.opt
@@ -1 +1 @@
---disable-log-bin
+--skip-log-bin