diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml
index 2e4a06de2..7c0844d97 100644
--- a/test/fixtures/domains.yml
+++ b/test/fixtures/domains.yml
@@ -28,24 +28,6 @@ library:
   period: 1
   period_unit: m
 
-non_transferable:
-  name: non-transferable.test
-  transfer_code: d382682
-  valid_to: 2010-07-05
-  registrar: bestnames
-  registrant: john
-  statuses:
-    - serverTransferProhibited
-
-discarded:
-  name: discarded.test
-  transfer_code: any
-  valid_to: 2010-07-05
-  registrar: bestnames
-  registrant: john
-  statuses:
-    - deleteCandidate
-
 invalid:
   name: invalid.test
   transfer_code: any
diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb
index 0ceeca30a..aa9f841b6 100644
--- a/test/integration/epp/domain/transfer/base_test.rb
+++ b/test/integration/epp/domain/transfer/base_test.rb
@@ -1,29 +1,6 @@
 require 'test_helper'
 
 class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest
-  def test_non_transferable_domain
-    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>
-          <transfer op="query">
-            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>non-transferable.test</domain:name>
-              <domain:authInfo>
-                <domain:pw>d382682</domain:pw>
-              </domain:authInfo>
-            </domain:transfer>
-          </transfer>
-        </command>
-      </epp>
-    XML
-
-    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
-    domains(:shop).reload
-    assert_equal registrars(:bestnames), domains(:shop).registrar
-    assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code]
-  end
-
   def test_non_existent_domain
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb
index e83bfb2e4..cc9fb5475 100644
--- a/test/integration/epp/domain/transfer/request_test.rb
+++ b/test/integration/epp/domain/transfer/request_test.rb
@@ -64,25 +64,22 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_non_transferable_domain
+    @domain.update!(statuses: [DomainStatus::SERVER_TRANSFER_PROHIBITED])
+
+    post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
+    domains(:shop).reload
+
+    assert_equal registrars(:bestnames), domains(:shop).registrar
+    assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code]
+  end
+
   def test_discarded_domain
-    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>
-          <transfer op="request">
-            <domain:transfer xmlns:domain="https://epp.tld.ee/schema/domain-eis-1.0.xsd">
-              <domain:name>discarded.test</domain:name>
-              <domain:authInfo>
-                <domain:pw>any</domain:pw>
-              </domain:authInfo>
-            </domain:transfer>
-          </transfer>
-        </command>
-      </epp>
-    XML
+    @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE])
 
     post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' }
     @domain.reload
+
     assert_equal registrars(:bestnames), @domain.registrar
     assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code]
   end