diff --git a/test/cookbooks/os_prepare/recipes/x509.rb b/test/cookbooks/os_prepare/recipes/x509.rb
index 694875060..3895ebb14 100644
--- a/test/cookbooks/os_prepare/recipes/x509.rb
+++ b/test/cookbooks/os_prepare/recipes/x509.rb
@@ -1,6 +1,6 @@
 if node['platform_family'] != 'windows'
 
-  openssl_x509_request '/tmp/mycert.pem' do
+  openssl_x509_certificate '/tmp/mycert.pem' do
     common_name 'www.f00bar.com'
     org 'Foo Bar'
     org_unit 'Lab'
diff --git a/test/integration/default/controls/x509_spec.rb b/test/integration/default/controls/x509_spec.rb
index 6367c6e6c..f19645243 100644
--- a/test/integration/default/controls/x509_spec.rb
+++ b/test/integration/default/controls/x509_spec.rb
@@ -11,9 +11,9 @@ describe x509_certificate('/tmp/mycert.pem') do
   its('signature_algorithm') { should eq 'sha256WithRSAEncryption' }
   its('validity_in_days') { should_not be < 100 }
   its('validity_in_days') { should be >= 100 }
-  its('subject_dn') { should eq '/C=US/ST= /L= /O=Foo Bar/OU=Lab/CN=www.f00bar.com' }
+  its('subject_dn') { should eq '/C=US/O=Foo Bar/OU=Lab/CN=www.f00bar.com' }
   its('subject.C') { should eq 'US' }
-  its('issuer_dn') { should eq '/C=US/ST= /L= /O=Foo Bar/OU=Lab/CN=www.f00bar.com' }
+  its('issuer_dn') { should eq '/C=US/O=Foo Bar/OU=Lab/CN=www.f00bar.com' }
   its('key_length') { should be >= 2048 }
 end