diff --git a/lib/devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples.rb b/lib/devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples.rb
index e33d439..327833e 100644
--- a/lib/devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples.rb
+++ b/lib/devise_two_factor/spec_helpers/two_factor_authenticatable_shared_examples.rb
@@ -8,7 +8,7 @@
 
   describe 'required_fields' do
     it 'has the fields for otp_backup_codes' do
-      expect(Devise::Models::TwoFactorBackupable.required_fields(subject.class)).to contain_exactly(:otp_secret, :consumed_timestep)
+      expect(Devise::Models::TwoFactorAuthenticatable.required_fields(subject.class)).to contain_exactly(:otp_secret, :consumed_timestep)
     end
   end
 
diff --git a/spec/devise/models/two_factor_authenticatable_spec.rb b/spec/devise/models/two_factor_authenticatable_spec.rb
index 3458c61..9aac7fc 100644
--- a/spec/devise/models/two_factor_authenticatable_spec.rb
+++ b/spec/devise/models/two_factor_authenticatable_spec.rb
@@ -11,6 +11,7 @@ class TwoFactorAuthenticatableDouble
   devise :two_factor_authenticatable, :otp_secret_encryption_key => 'test-key'*4
 
   attr_accessor :consumed_timestep
+  attr_accessor :otp_secret
 
   def save(validate)
     # noop for testing
@@ -18,30 +19,30 @@ def save(validate)
   end
 end
 
-class TwoFactorAuthenticatableWithCustomizeAttrEncryptedDouble
-  extend ::ActiveModel::Callbacks
-  include ::ActiveModel::Validations::Callbacks
-
-  # like https://github.com/tinfoil/devise-two-factor/blob/cf73e52043fbe45b74d68d02bc859522ad22fe73/UPGRADING.md#guide-to-upgrading-from-2x-to-3x
-  extend ::AttrEncrypted
-  attr_encrypted :otp_secret,
-                  :key       => 'test-key'*8,
-                  :mode      => :per_attribute_iv_and_salt,
-                  :algorithm => 'aes-256-cbc'
-
-  extend  ::Devise::Models
-
-  define_model_callbacks :update
-
-  devise :two_factor_authenticatable, :otp_secret_encryption_key => 'test-key'*4
-
-  attr_accessor :consumed_timestep
-
-  def save(validate)
-    # noop for testing
-    true
-  end
-end
+# class TwoFactorAuthenticatableWithCustomizeAttrEncryptedDouble
+#   extend ::ActiveModel::Callbacks
+#   include ::ActiveModel::Validations::Callbacks
+#
+#   # like https://github.com/tinfoil/devise-two-factor/blob/cf73e52043fbe45b74d68d02bc859522ad22fe73/UPGRADING.md#guide-to-upgrading-from-2x-to-3x
+#   extend ::AttrEncrypted
+#   attr_encrypted :otp_secret,
+#                   :key       => 'test-key'*8,
+#                   :mode      => :per_attribute_iv_and_salt,
+#                   :algorithm => 'aes-256-cbc'
+#
+#   extend  ::Devise::Models
+#
+#   define_model_callbacks :update
+#
+#   devise :two_factor_authenticatable, :otp_secret_encryption_key => 'test-key'*4
+#
+#   attr_accessor :consumed_timestep
+#
+#   def save(validate)
+#     # noop for testing
+#     true
+#   end
+# end
 
 describe ::Devise::Models::TwoFactorAuthenticatable do
   context 'When included in a class' do
@@ -51,32 +52,32 @@ def save(validate)
   end
 end
 
-describe ::Devise::Models::TwoFactorAuthenticatable do
-  context 'When included in a class' do
-    subject { TwoFactorAuthenticatableWithCustomizeAttrEncryptedDouble.new }
-
-    it_behaves_like 'two_factor_authenticatable'
-
-    before :each do
-      subject.otp_secret = subject.class.generate_otp_secret
-      subject.consumed_timestep = nil
-    end
-
-    describe 'otp_secret options' do
-      it 'should be of the key' do
-        expect(subject.encrypted_attributes[:otp_secret][:key]).to eq('test-key'*8)
-      end
-
-      it 'should be of the mode' do
-        expect(subject.encrypted_attributes[:otp_secret][:mode]).to eq(:per_attribute_iv_and_salt)
-      end
-
-      it 'should be of the mode' do
-        expect(subject.encrypted_attributes[:otp_secret][:algorithm]).to eq('aes-256-cbc')
-      end
-    end
-  end
-end
+# describe ::Devise::Models::TwoFactorAuthenticatable do
+#   context 'When included in a class' do
+#     subject { TwoFactorAuthenticatableWithCustomizeAttrEncryptedDouble.new }
+#
+#     it_behaves_like 'two_factor_authenticatable'
+#
+#     before :each do
+#       subject.otp_secret = subject.class.generate_otp_secret
+#       subject.consumed_timestep = nil
+#     end
+#
+#     describe 'otp_secret options' do
+#       it 'should be of the key' do
+#         expect(subject.encrypted_attributes[:otp_secret][:key]).to eq('test-key'*8)
+#       end
+#
+#       it 'should be of the mode' do
+#         expect(subject.encrypted_attributes[:otp_secret][:mode]).to eq(:per_attribute_iv_and_salt)
+#       end
+#
+#       it 'should be of the mode' do
+#         expect(subject.encrypted_attributes[:otp_secret][:algorithm]).to eq('aes-256-cbc')
+#       end
+#     end
+#   end
+# end
 
 describe ::Devise::Models::TwoFactorAuthenticatable do
   context 'When clean_up_passwords is called ' do