diff --git a/spec/webauthn/relying_party_spec.rb b/spec/webauthn/relying_party_spec.rb
index 2f095236..661c7fd2 100644
--- a/spec/webauthn/relying_party_spec.rb
+++ b/spec/webauthn/relying_party_spec.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require "ostruct"
 require "spec_helper"
 require "webauthn/fake_authenticator"
 require "webauthn/fake_client"
 require "webauthn/relying_party"
 
 RSpec.describe "RelyingParty" do
+  let(:credential_klass) { Struct.new(:webauthn_id, :public_key, :sign_count, keyword_init: true) }
+
   let(:authenticator) { WebAuthn::FakeAuthenticator.new }
 
   let(:admin_rp) do
@@ -21,7 +22,8 @@
   end
 
   let(:user) do
-    OpenStruct.new(id: WebAuthn.generate_user_id, name: 'John Doe', credentials: [])
+    user_klass = Struct.new(:id, :name, :credentials, keyword_init: true)
+    user_klass.new(id: WebAuthn.generate_user_id, name: 'John Doe', credentials: [])
   end
 
   describe '#verify_registration' do
@@ -76,7 +78,7 @@
     let(:admin_credential_public_key) { admin_credential[1] }
 
     before do
-      user.credentials << OpenStruct.new(
+      user.credentials << credential_klass.new(
         webauthn_id: admin_credential.first,
         public_key: admin_rp.encoder.encode(admin_credential[1]),
         sign_count: 0
@@ -194,12 +196,12 @@
       end
 
       before do
-        user.credentials << OpenStruct.new(
+        user.credentials << credential_klass.new(
           webauthn_id: admin_credential.first,
           public_key: admin_rp.encoder.encode(admin_credential[1]),
           sign_count: 0
         )
-        user.credentials << OpenStruct.new(
+        user.credentials << credential_klass.new(
           webauthn_id: consumer_credential.first,
           public_key: consumer_rp.encoder.encode(consumer_credential[1]),
           sign_count: 0
@@ -324,12 +326,12 @@
       end
 
       before do
-        user.credentials << OpenStruct.new(
+        user.credentials << credential_klass.new(
           webauthn_id: admin_credential.first,
           public_key: admin_rp.encoder.encode(admin_credential[1]),
           sign_count: 0
         )
-        user.credentials << OpenStruct.new(
+        user.credentials << credential_klass.new(
           webauthn_id: default_configuration_credential.first,
           public_key: WebAuthn.configuration.encoder.encode(default_configuration_credential[1]),
           sign_count: 0
@@ -419,7 +421,7 @@
       end
 
       before do
-        user.credentials << OpenStruct.new(
+        user.credentials << credential_klass.new(
           webauthn_id: default_configuration_credential.first,
           public_key: WebAuthn.configuration.encoder.encode(default_configuration_credential[1]),
           sign_count: 0