diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index cb30a3186e5..ac4a448ba5c 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -74,6 +74,14 @@ sub skip_combinations {
   $skip{'main/ssl_verify_ip.test'} = 'x509v3 support required'
     unless $openssl_ver ge "1.0.2";
 
+  my $openssl_cnf='/etc/ssl/openssl.cnf';
+  if ($openssl_ver and open my $f, '<', $openssl_cnf) {
+    local $/;
+    $_=<$f>;
+    $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf"
+      if /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m;
+  }
+
   %skip;
 }