diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 316bbb0c9..4f80be8ee 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -881,7 +881,13 @@ bad:
 		meth=SSLv23_method();
 #else
 #ifdef OPENSSL_NO_SSL2
-	meth=SSLv3_method();
+	if (tls1)
+		meth=TLSv1_method();
+	else
+	if (ssl3)
+		meth=SSLv3_method();
+	else
+		meth=SSLv23_method();
 #else
 	meth=SSLv2_method();
 #endif