diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0315456df57..33954999e53 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2424,8 +2424,10 @@ sub environment_setup {
   #
   $ENV{'LC_ALL'}=             "C";
   $ENV{'LC_CTYPE'}=           "C";
-
   $ENV{'LC_COLLATE'}=         "C";
+
+  $ENV{'OPENSSL_CONF'}=       "/dev/null";
+
   $ENV{'USE_RUNNING_SERVER'}= using_extern();
   $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;
   $ENV{'DEFAULT_MASTER_PORT'}= $mysqld_variables{'port'};
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index e21db289445..6666947b03d 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -89,16 +89,6 @@ 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 $/;
-    my $cnf=<$f>;
-    $skip{'main/tls_version.test'} = "TLSv1.1 disabled in $openssl_cnf"
-      if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[2-9]/m;
-    $skip{'main/tls_version1.test'} = "TLSv1.0 disabled in $openssl_cnf"
-      if $cnf =~ /^\s*MinProtocol\s*=\s*TLSv1.[1-9]/m;
-  }
-
   %skip;
 }