diff --git a/ChangeLog b/ChangeLog
index a7550481e8..401bc6794d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  7 06:16:33 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* test/openssl/test_ocsp.rb: adding test for r29699.  Thanks Elise
+	  Huard! [ruby-core:32460]
+
 Sat Nov  6 07:33:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (rb_cv_export_prefix): check for prefixed
diff --git a/test/openssl/test_ocsp.rb b/test/openssl/test_ocsp.rb
new file mode 100644
index 0000000000..c2bd155a18
--- /dev/null
+++ b/test/openssl/test_ocsp.rb
@@ -0,0 +1,55 @@
+begin
+  require "openssl"
+  require_relative "utils"
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(OpenSSL)
+
+class OpenSSL::TestOCSP < Test::Unit::TestCase
+  def setup
+    ca_subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCA")
+    ca_key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    ca_serial = 0xabcabcabcabc
+
+    subj = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=TestCert")
+    @key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    serial = 0xabcabcabcabd
+
+    now = Time.at(Time.now.to_i) # suppress usec
+    dgst = OpenSSL::Digest::SHA1.new
+
+    @ca_cert = OpenSSL::TestUtils.issue_cert(
+       ca_subj, ca_key, ca_serial, now, now+3600, [], nil, nil, dgst)
+    @cert = OpenSSL::TestUtils.issue_cert(
+       subj, @key, serial, now, now+3600, [], @ca_cert, nil, dgst)
+  end
+
+  def teardown
+  end
+
+  def test_new_certificate_id
+    cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert)
+    assert_kind_of OpenSSL::OCSP::CertificateId, cid 
+    assert_equal @cert.serial, cid.serial
+  end
+
+  def test_new_certificate_id_with_digest
+    cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA256.new)
+    assert_kind_of OpenSSL::OCSP::CertificateId, cid 
+    assert_equal @cert.serial, cid.serial
+  end
+
+  def test_new_ocsp_request
+    request = OpenSSL::OCSP::Request.new
+    cid = OpenSSL::OCSP::CertificateId.new(@cert, @ca_cert, OpenSSL::Digest::SHA1.new)
+    request.add_certid(cid)
+    request.sign(@cert, @key, [@cert])
+    assert_kind_of OpenSSL::OCSP::Request, request
+    # in current implementation not same instance of certificate id, but should contain same data
+    assert_equal cid.serial, request.certid.first.serial
+  end
+end
+
+end