diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc
new file mode 100644
index 00000000000..f0eded81b59
--- /dev/null
+++ b/mysql-test/include/have_openssl.inc
@@ -0,0 +1,2 @@
+-- require r/have_ssl.require
+show variables like "have_ssl";
diff --git a/mysql-test/r/have_openssl.require b/mysql-test/r/have_openssl.require
new file mode 100644
index 00000000000..9bdffdf0c13
--- /dev/null
+++ b/mysql-test/r/have_openssl.require
@@ -0,0 +1,2 @@
+Variable_name	Value
+have_ssl	YES
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/openssl_1.result
similarity index 100%
rename from mysql-test/r/ssl.result
rename to mysql-test/r/openssl_1.result
diff --git a/mysql-test/r/openssl_2.result b/mysql-test/r/openssl_2.result
new file mode 100644
index 00000000000..6636a336c45
--- /dev/null
+++ b/mysql-test/r/openssl_2.result
@@ -0,0 +1,16 @@
+Variable_name	Value
+SSL_CTX_sess_accept	0
+SSL_CTX_sess_accept_good	0
+SSL_CTX_sess_accept_renegotiate	0
+SSL_CTX_sess_cb_hits	0
+SSL_CTX_sess_number	0
+SSL_CTX_get_session_cache_mode	SERVER
+SSL_CTX_sess_get_cache_size	128
+SSL_CTX_get_verify_mode	7
+SSL_CTX_get_verify_depth	4294967295
+SSL_get_verify_mode	0
+SSL_get_verify_depth	0
+SSL_session_reused	0
+SSL_get_version	
+SSL_get_cipher	
+SSL_get_default_timeout	0
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test
new file mode 100644
index 00000000000..da87604f45a
--- /dev/null
+++ b/mysql-test/t/openssl_1.test
@@ -0,0 +1,5 @@
+# We test openssl. Result set is optimized to be compiled with --with-openssl but 
+# SSL is swithced off in some reason
+
+SHOW STATUS LIKE 'SSL%';
+
diff --git a/mysql-test/t/openssl_2.test b/mysql-test/t/openssl_2.test
new file mode 100644
index 00000000000..2195d7302e2
--- /dev/null
+++ b/mysql-test/t/openssl_2.test
@@ -0,0 +1,6 @@
+-- source include/have_openssl.inc 
+
+# We want to test everything with SSL turned on. 
+
+SHOW STATUS LIKE 'SSL%';
+
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test
deleted file mode 100644
index da5e66fc835..00000000000
--- a/mysql-test/t/ssl.test
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-SHOW STATUS LIKE 'SSL%';
-