diff --git a/test/integration/epp/domain/domain_renew_test.rb b/test/integration/epp/domain/domain_renew_test.rb
index 8ab598102..7884db86f 100644
--- a/test/integration/epp/domain/domain_renew_test.rb
+++ b/test/integration/epp/domain/domain_renew_test.rb
@@ -3,23 +3,20 @@ require 'test_helper'
 class EppDomainRenewTest < EppTestCase
   self.use_transactional_fixtures = false
 
-  setup do
-    @domain = domains(:shop)
-    travel_to Time.zone.parse('2010-07-05')
-  end
-
   def test_renews_domain
     travel_to Time.zone.parse('2010-07-05')
-    original_valid_to = @domain.valid_to
+    domain = domains(:shop)
+    original_valid_to = domain.valid_to
     default_renewal_period = 1.year
+
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <renew>
             <domain:renew xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>#{@domain.name}</domain:name>
-              <domain:curExpDate>#{@domain.expire_time.to_date}</domain:curExpDate>
+              <domain:name>#{domain.name}</domain:name>
+              <domain:curExpDate>#{domain.expire_time.to_date}</domain:curExpDate>
               <domain:period unit="y">1</domain:period>
             </domain:renew>
           </renew>
@@ -28,21 +25,23 @@ class EppDomainRenewTest < EppTestCase
     XML
 
     post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
-    @domain.reload
+    domain.reload
 
     assert_epp_response :completed_successfully
-    assert_equal original_valid_to + default_renewal_period, @domain.valid_to
+    assert_equal original_valid_to + default_renewal_period, domain.valid_to
   end
 
   def test_domain_cannot_be_renewed_when_invalid
+    domain = domains(:invalid)
+
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <renew>
             <domain:renew xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>invalid.test</domain:name>
-              <domain:curExpDate>2010-07-05</domain:curExpDate>
+              <domain:name>#{domain.name}</domain:name>
+              <domain:curExpDate>#{domain.valid_to.to_date}</domain:curExpDate>
               <domain:period unit="m">1</domain:period>
             </domain:renew>
           </renew>
@@ -50,15 +49,16 @@ class EppDomainRenewTest < EppTestCase
       </epp>
     XML
 
-    assert_no_changes -> { domains(:invalid).valid_to } do
+    assert_no_changes -> { domain.valid_to } do
       post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
+      domain.reload
     end
     assert_epp_response :object_status_prohibits_operation
   end
 
   def test_domain_cannot_be_renewed_when_belongs_to_another_registrar
-    session = epp_sessions(:api_bestnames)
     domain = domains(:metro)
+    session = epp_sessions(:api_bestnames)
     assert_not_equal session.user.registrar, domain.registrar
 
     request_xml = <<-XML
@@ -76,24 +76,27 @@ class EppDomainRenewTest < EppTestCase
       </epp>
     XML
 
-    assert_no_changes -> { domains(:invalid).valid_to } do
+    assert_no_changes -> { domain.valid_to } do
       post '/epp/command/renew', { frame: request_xml },
            'HTTP_COOKIE' => "session=#{session.session_id}"
+      domain.reload
     end
     assert_epp_response :authorization_error
   end
 
   def test_insufficient_funds
+    domain = domains(:shop)
     session = epp_sessions(:api_bestnames)
     session.user.registrar.accounts.first.update!(balance: 0)
+
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
       <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
         <command>
           <renew>
             <domain:renew xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>#{@domain.name}</domain:name>
-              <domain:curExpDate>#{@domain.expire_time.to_date}</domain:curExpDate>
+              <domain:name>#{domain.name}</domain:name>
+              <domain:curExpDate>#{domain.expire_time.to_date}</domain:curExpDate>
               <domain:period unit="y">1</domain:period>
             </domain:renew>
           </renew>
@@ -101,14 +104,16 @@ class EppDomainRenewTest < EppTestCase
       </epp>
     XML
 
-    @domain.reload
-    assert_no_difference -> { @domain.valid_to } do
-      post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session.session_id}"
+    assert_no_difference -> { domain.valid_to } do
+      post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' =>
+        "session=#{session.session_id}"
+      domain.reload
     end
     assert_epp_response :billing_failure
   end
 
   def test_no_price
+    domain = domains(:shop)
     assert_nil Billing::Price.find_by(duration: '2 months')
 
     request_xml = <<-XML
@@ -117,8 +122,8 @@ class EppDomainRenewTest < EppTestCase
         <command>
           <renew>
             <domain:renew xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>#{@domain.name}</domain:name>
-              <domain:curExpDate>#{@domain.expire_time.to_date}</domain:curExpDate>
+              <domain:name>#{domain.name}</domain:name>
+              <domain:curExpDate>#{domain.expire_time.to_date}</domain:curExpDate>
               <domain:period unit="m">2</domain:period>
             </domain:renew>
           </renew>
@@ -126,15 +131,17 @@ class EppDomainRenewTest < EppTestCase
       </epp>
     XML
 
-    assert_no_changes -> { @domain.valid_to } do
+    assert_no_changes -> { domain.valid_to } do
       post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
+      domain.reload
     end
     assert_epp_response :billing_failure
   end
 
   def test_fails_when_provided_expiration_date_is_wrong
+    domain = domains(:shop)
     provided_expiration_date = Date.parse('2010-07-06')
-    assert_not_equal provided_expiration_date, @domain.valid_to
+    assert_not_equal provided_expiration_date, domain.valid_to
 
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -142,7 +149,7 @@ class EppDomainRenewTest < EppTestCase
         <command>
           <renew>
             <domain:renew xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>#{@domain.name}</domain:name>
+              <domain:name>#{domain.name}</domain:name>
               <domain:curExpDate>#{provided_expiration_date}</domain:curExpDate>
             </domain:renew>
           </renew>
@@ -150,8 +157,9 @@ class EppDomainRenewTest < EppTestCase
       </epp>
     XML
 
-    assert_no_changes -> { @domain.valid_to } do
+    assert_no_changes -> { domain.valid_to } do
       post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
+      domain.reload
     end
     assert_epp_response :parameter_value_policy_error
   end