diff --git a/app/models/concerns/registrar/legal_doc.rb b/app/models/concerns/registrar/legal_doc.rb
index e2ed9f83e..2f21f6637 100644
--- a/app/models/concerns/registrar/legal_doc.rb
+++ b/app/models/concerns/registrar/legal_doc.rb
@@ -8,7 +8,7 @@ module Concerns
       end
 
       def legaldoc_not_mandatory?
-        setting = Setting.find_by(var: 'legal_document_is_mandatory')&.value
+        setting = Setting.legal_document_is_mandatory
         legaldoc_optout || !setting
       end
     end
diff --git a/db/data/20200702104334_add_legal_document_mandatory_setting.rb b/db/data/20200702104334_add_legal_document_mandatory_setting.rb
index 2e0a298f7..9e3bf40fc 100644
--- a/db/data/20200702104334_add_legal_document_mandatory_setting.rb
+++ b/db/data/20200702104334_add_legal_document_mandatory_setting.rb
@@ -1,9 +1,11 @@
 class AddLegalDocumentMandatorySetting < ActiveRecord::Migration[6.0]
   def up
-    Setting.legal_document_is_mandatory = true
+    Setting.create(code: 'legal_document_is_mandatory',
+                   value: 'true', format: 'boolean',
+                   group: 'domain_validation')
   end
 
   def down
-    Setting.find_by(var: 'legal_document_is_mandatory').delete
+    Setting.find_by(code: 'legal_document_is_mandatory').destroy
   end
 end
diff --git a/test/integration/epp/domain/create/base_test.rb b/test/integration/epp/domain/create/base_test.rb
index b75ef8909..9d817524d 100644
--- a/test/integration/epp/domain/create/base_test.rb
+++ b/test/integration/epp/domain/create/base_test.rb
@@ -3,8 +3,6 @@ require 'test_helper'
 class EppDomainCreateBaseTest < EppTestCase
 
   def test_not_registers_domain_without_legaldoc
-    old_value = Setting.legal_document_is_mandatory
-    Setting.legal_document_is_mandatory = true
     now = Time.zone.parse('2010-07-05')
     travel_to now
     name = "new.#{dns_zones(:one).origin}"
@@ -31,7 +29,6 @@ class EppDomainCreateBaseTest < EppTestCase
     end
 
     assert_epp_response :required_parameter_missing
-    Setting.legal_document_is_mandatory = old_value
   end
 
   def test_registers_new_domain_with_required_attributes
@@ -121,8 +118,6 @@ class EppDomainCreateBaseTest < EppTestCase
     name = "new.#{dns_zones(:one).origin}"
     contact = contacts(:john)
     registrant = contact.becomes(Registrant)
-    old_value = Setting.legal_document_is_mandatory
-    Setting.legal_document_is_mandatory = true
     registrar = registrant.registrar
 
     assert registrar.legaldoc_mandatory?
@@ -155,8 +150,6 @@ class EppDomainCreateBaseTest < EppTestCase
       post epp_create_path, params: { frame: request_xml },
            headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
     end
-
-    Setting.legal_document_is_mandatory = old_value
   end
 
   def test_registers_reserved_domain_with_registration_code
diff --git a/test/jobs/directo_invoice_forward_job_test.rb b/test/jobs/directo_invoice_forward_job_test.rb
index 57b1759ff..32ae39e7a 100644
--- a/test/jobs/directo_invoice_forward_job_test.rb
+++ b/test/jobs/directo_invoice_forward_job_test.rb
@@ -8,7 +8,6 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
   end
 
   def teardown
-    Setting.clear_cache
     Setting.directo_monthly_number_min = 309901
     Setting.directo_monthly_number_max = 309999
     Setting.directo_monthly_number_last = 309901