diff --git a/test/api/domain_transfers_test.rb b/test/api/domain_transfers_test.rb
index 40667dbaf..6cd868314 100644
--- a/test/api/domain_transfers_test.rb
+++ b/test/api/domain_transfers_test.rb
@@ -14,6 +14,6 @@ class Repp::DomainTransfersTest < ActionDispatch::IntegrationTest
   private
 
   def http_auth_key
-    ActionController::HttpAuthentication::Basic.encode_credentials(users(:api).username, users(:api).password)
+    ActionController::HttpAuthentication::Basic.encode_credentials(users(:api_bestnames).username, users(:api_bestnames).password)
   end
 end
diff --git a/test/fixtures/epp_sessions.yml b/test/fixtures/epp_sessions.yml
index 8a2104f8c..8cdaedb8c 100644
--- a/test/fixtures/epp_sessions.yml
+++ b/test/fixtures/epp_sessions.yml
@@ -1,3 +1,9 @@
-shop:
+api_bestnames:
+  session_id: 1
   registrar: bestnames
-  data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api)})) %>
+  data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_bestnames)})) %>
+
+api_goodnames:
+  session_id: 2
+  registrar: goodnames
+  data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_goodnames)})) %>
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index e07415d6f..e8e17b569 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,11 +1,19 @@
-api:
-  username: test
-  password: test
+api_bestnames:
+  username: test_bestnames
+  password: testtest
   type: ApiUser
   registrar: bestnames
   roles:
     - super
 
+api_goodnames:
+  username: test_goodnames
+  password: testtest
+  type: ApiUser
+  registrar: goodnames
+  roles:
+    - super
+
 admin:
   username: test
   type: AdminUser
diff --git a/test/integration/registrar/domains_test.rb b/test/integration/registrar/domains_test.rb
index e0fdca33e..8c68387cb 100644
--- a/test/integration/registrar/domains_test.rb
+++ b/test/integration/registrar/domains_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RegistrarDomainsTest < ActionDispatch::IntegrationTest
   def setup
-    login_as users(:api)
+    login_as users(:api_bestnames)
   end
 
   def test_downloads_domain_list_as_csv