diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ca037830caf..e53039ba65e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3193,6 +3193,11 @@ sub start_mysqltest ($) {
     # Turn on SSL for _all_ test cases if option --ssl was used
     mtr_add_arg($args, "--ssl");
   }
+  elsif ( $opt_ssl_supported )
+  {
+    mtr_add_arg($args, "--skip-ssl");
+  }
+
 
   # ----------------------------------------------------------------------
   # export MYSQL_TEST variable containing <path>/mysqltest <args>