diff --git a/test/system/registrar_area/add_deposits_test.rb b/test/system/registrar_area/add_deposits_test.rb
index 9fd9c3062..2d12e63ad 100644
--- a/test/system/registrar_area/add_deposits_test.rb
+++ b/test/system/registrar_area/add_deposits_test.rb
@@ -12,8 +12,6 @@ class AddDepositsTest < ApplicationSystemTestCase
 
   def test_should_send_request_for_creating_invoice_to_eis_system
     eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
 
     visit new_registrar_deposit_url
diff --git a/test/system/registrar_area/billing/balance_top_up_test.rb b/test/system/registrar_area/billing/balance_top_up_test.rb
index dd749bcbd..0c2129d21 100644
--- a/test/system/registrar_area/billing/balance_top_up_test.rb
+++ b/test/system/registrar_area/billing/balance_top_up_test.rb
@@ -7,8 +7,6 @@ class BalanceTopUpTest < ApplicationSystemTestCase
 
     eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
     Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
   end
 
   teardown do
diff --git a/test/system/registrar_area/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
index 0b0a5c6e6..a162a6b56 100644
--- a/test/system/registrar_area/invoices/new_invoice_payment_test.rb
+++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb
@@ -5,7 +5,6 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase
     super
     eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
     Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
 
     @original_vat_prc = Setting.registry_vat_prc
     Setting.registry_vat_prc = 0.2
diff --git a/test/system/registrar_area/invoices/new_test.rb b/test/system/registrar_area/invoices/new_test.rb
index f56f6cb7d..664d0d3c9 100644
--- a/test/system/registrar_area/invoices/new_test.rb
+++ b/test/system/registrar_area/invoices/new_test.rb
@@ -9,7 +9,6 @@ class NewInvoiceTest < ApplicationSystemTestCase
 
     eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
     Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
   end
 
   def test_show_balance
diff --git a/test/system/registrar_area/invoices_test.rb b/test/system/registrar_area/invoices_test.rb
index b6ed40924..250f00913 100644
--- a/test/system/registrar_area/invoices_test.rb
+++ b/test/system/registrar_area/invoices_test.rb
@@ -13,9 +13,6 @@ class RegistrarAreaInvoicesTest < ApplicationSystemTestCase
   end
 
   def test_cancels_an_invoice
-    eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     @invoice.account_activity = nil
     assert @invoice.cancellable?
 
@@ -28,18 +25,12 @@ class RegistrarAreaInvoicesTest < ApplicationSystemTestCase
   end
 
   def test_invoice_delivery_form_is_pre_populated_with_billing_email_of_a_registrar
-    eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     assert_equal 'billing@bestnames.test', @invoice.buyer.billing_email
     visit new_registrar_invoice_delivery_url(@invoice)
     assert_field 'Recipient', with: 'billing@bestnames.test'
   end
 
   def test_delivers_an_invoice
-    eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     visit registrar_invoice_url(@invoice)
     click_on 'Send'
     fill_in 'Recipient', with: 'billing@registrar.test'
@@ -53,9 +44,6 @@ class RegistrarAreaInvoicesTest < ApplicationSystemTestCase
   end
 
   def test_if_invoice_unpaid_should_be_present_everypay_link
-    eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     invoice = invoices(:unpaid)
     visit registrar_invoice_url(invoice)
 
@@ -63,9 +51,6 @@ class RegistrarAreaInvoicesTest < ApplicationSystemTestCase
   end
 
   def test_if_invoice_unpaid_and_not_generated_link_comes_then_should_render_no_everypay_link
-    eis_response = OpenStruct.new(body: "{\"error\":\"Invoice not found\", \"status\":\"no_found\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     invoice = invoices(:unpaid)
     visit registrar_invoice_url(invoice)
 
@@ -73,9 +58,6 @@ class RegistrarAreaInvoicesTest < ApplicationSystemTestCase
   end
 
   def test_if_invoice_aldready_paid_there_should_not_any_everypay_link
-    eis_response = OpenStruct.new(body: "{\"payment_link\":\"http://link.test\"}")
-    Spy.on_instance_method(EisBilling::GetInvoiceLink, :send_request).and_return(eis_response)
-
     visit registrar_invoice_url(@invoice)
 
     assert_no_text 'No everypay link'