diff --git a/test/integration/admin/registrars/new_test.rb b/test/integration/admin/registrars/new_test.rb
index 47b7aded6..cadb513e9 100644
--- a/test/integration/admin/registrars/new_test.rb
+++ b/test/integration/admin/registrars/new_test.rb
@@ -3,6 +3,12 @@ require 'test_helper'
 class AdminAreaNewRegistrarTest < ActionDispatch::IntegrationTest
   setup do
     login_as users(:admin)
+    @original_registry_country_code = Setting.registry_country_code
+    Setting.registry_country_code = 'DE'
+  end
+
+  teardown do
+    Setting.registry_country_code = @original_registry_country_code
   end
 
   def test_new_registrar_creation_with_required_params
@@ -12,6 +18,7 @@ class AdminAreaNewRegistrarTest < ActionDispatch::IntegrationTest
     fill_in 'Name', with: 'Brand new names'
     fill_in 'Reg no', with: '55555555'
     fill_in 'Contact e-mail', with: 'test@example.com'
+    select 'Germany', from: 'Country'
     fill_in 'Accounting customer code', with: 'test'
     fill_in 'Code', with: 'test'
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index e319656be..931a0d21b 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -14,7 +14,6 @@ require 'webmock/minitest'
 require 'support/rails5_assetions' # Remove once upgraded to Rails 5
 
 Setting.address_processing = false
-Setting.registry_country_code = 'US'
 
 class ActiveSupport::TestCase
   include FactoryBot::Syntax::Methods