diff --git a/test/integration/epp/session/login_test.rb b/test/integration/epp/login/credentials_test.rb
similarity index 97%
rename from test/integration/epp/session/login_test.rb
rename to test/integration/epp/login/credentials_test.rb
index c268ab1eb..6a27c7393 100644
--- a/test/integration/epp/session/login_test.rb
+++ b/test/integration/epp/login/credentials_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppLoginTest < ActionDispatch::IntegrationTest
+class EppLoginCredentialsTest < ActionDispatch::IntegrationTest
   def test_correct_credentials
     request_xml = <<-XML
       <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/integration/epp/session/limit_test.rb b/test/integration/epp/login/session_limit_test.rb
similarity index 96%
rename from test/integration/epp/session/limit_test.rb
rename to test/integration/epp/login/session_limit_test.rb
index b186031b6..513699415 100644
--- a/test/integration/epp/session/limit_test.rb
+++ b/test/integration/epp/login/session_limit_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EppSessionLimitTest < ActionDispatch::IntegrationTest
+class EppLoginSessionLimitTest < ActionDispatch::IntegrationTest
   def setup
     travel_to Time.zone.parse('2010-07-05')
     EppSession.delete_all
diff --git a/test/integration/epp/session/logout_test.rb b/test/integration/epp/logout_test.rb
similarity index 100%
rename from test/integration/epp/session/logout_test.rb
rename to test/integration/epp/logout_test.rb