diff --git a/spec/support/matchers/epp/code.rb b/spec/support/matchers/epp/code.rb
index db79488b3..042598c50 100644
--- a/spec/support/matchers/epp/code.rb
+++ b/spec/support/matchers/epp/code.rb
@@ -11,7 +11,11 @@ module Matchers
       end
 
       def failure_message
-        "Expected EPP code of #{expected}, got #{actual} (#{description})"
+        "Expected EPP code of #{expected}, got #{actual} (#{code_description})"
+      end
+
+      def description
+        "should have EPP code of #{expected}"
       end
 
       private
@@ -23,7 +27,7 @@ module Matchers
         xml_document.xpath('//xmlns:result').first['code'].to_i
       end
 
-      def description
+      def code_description
         xml_document.css('result msg').text
       end
 
diff --git a/spec/support/settings.rb b/spec/support/settings.rb
index ff1aa50a4..bf7fbc5d5 100644
--- a/spec/support/settings.rb
+++ b/spec/support/settings.rb
@@ -6,7 +6,7 @@ RSpec.configure do |config|
       Setting.ds_algorithm = 2
       Setting.ds_data_allowed = true
       Setting.ds_data_with_key_allowed = true
-      Setting.key_data_allowed = true
+      Setting.key_data_allowed = false
 
       Setting.dnskeys_min_count = 0
       Setting.dnskeys_max_count = 9