diff --git a/mysql-test/lib/openssl.cnf b/mysql-test/lib/openssl.cnf
new file mode 100644
index 00000000000..b9ab37ac3a1
--- /dev/null
+++ b/mysql-test/lib/openssl.cnf
@@ -0,0 +1,12 @@
+# Toplevel section for openssl (including libssl)
+openssl_conf = default_conf_section
+
+[default_conf_section]
+# We only specify configuration for the "ssl module"
+ssl_conf = ssl_section
+
+[ssl_section]
+system_default = system_default_section
+
+[system_default_section]
+CipherString = ALL:@SECLEVEL=1
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c524561edd9..6b6f0285100 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2283,7 +2283,8 @@ sub environment_setup {
   $ENV{'LC_CTYPE'}=           "C";
   $ENV{'LC_COLLATE'}=         "C";
 
-  $ENV{'OPENSSL_CONF'}=       "/dev/null";
+  $ENV{'OPENSSL_CONF'}= $mysqld_variables{'version-ssl-library'} gt 'OpenSSL 1.1.1'
+                       ? "$glob_mysql_test_dir/lib/openssl.cnf" : '/dev/null';
 
   $ENV{'USE_RUNNING_SERVER'}= using_extern();
   $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;