diff --git a/ChangeLog b/ChangeLog
index 7f55d62ed8..9841627692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 23 04:03:03 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c: fix tests by not setting the instance
+	  variable on the frozen ssl instance.
+
 Thu Jul 23 03:32:26 2015  Aaron Patterson <tenderlove@ruby-lang.org>
 
 	* ext/openssl/ossl_ssl.c: add ECDH callback support. [Feature #11356]
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index ccff027a6c..47bbac92c5 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -707,7 +707,6 @@ ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, c
     selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
     *out = (unsigned char *) StringValuePtr(selected);
     *outlen = RSTRING_LENINT(selected);
-    rb_iv_set(sslctx_obj, "@_alpn_selected", selected);
 
     return SSL_TLSEXT_ERR_OK;
 }