diff --git a/spec/epp/epp_helper_spec.rb b/spec/epp/epp_helper_spec.rb
index 0a0ccc80e..0927d7e38 100644
--- a/spec/epp/epp_helper_spec.rb
+++ b/spec/epp/epp_helper_spec.rb
@@ -2,16 +2,19 @@ require 'rails_helper'
 
 describe 'EPP Helper', epp: true do
   context 'in context of Domain' do
+    before(:all) { @uniq_no = proc { @i ||= 0; @i += 1 } }
+
     it 'generates valid transfer xml' do
+      dn = next_domain_name
       expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>
         <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
           <command>
             <transfer op="query">
               <domain:transfer
                xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-                <domain:name>example.ee</domain:name>
+                <domain:name>' + dn + '</domain:name>
                 <domain:authInfo>
-                  <domain:pw roid="JD1234-REP">98oiewslkfkd</domain:pw>
+                  <domain:pw roid="citizen_1234-REP">98oiewslkfkd</domain:pw>
                 </domain:authInfo>
               </domain:transfer>
             </transfer>
@@ -20,7 +23,7 @@ describe 'EPP Helper', epp: true do
         </epp>
       ').to_s.squish
 
-      generated = Nokogiri::XML(domain_transfer_xml).to_s.squish
+      generated = Nokogiri::XML(domain_transfer_xml(name: { value: dn })).to_s.squish
       expect(generated).to eq(expected)
 
       expected = Nokogiri::XML('<?xml version="1.0" encoding="UTF-8" standalone="no"?>