diff --git a/tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_auth_type_basic_admin_user.robot b/tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_admin_user.robot
similarity index 100%
rename from tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_auth_type_basic_admin_user.robot
rename to tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_admin_user.robot
diff --git a/tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_auth_type_basic_normal_user.robot b/tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_normal_user.robot
similarity index 100%
rename from tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_auth_type_basic_normal_user.robot
rename to tests/robot/AUTH_TYPE_TESTS/BASIC/suite_with_normal_user.robot
diff --git a/tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_auth_type_oauth_admin_user.robot b/tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_oauth_admin_user.robot
similarity index 100%
rename from tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_auth_type_oauth_admin_user.robot
rename to tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_oauth_admin_user.robot
diff --git a/tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_auth_type_oauth_normal_user.robot b/tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_oauth_normal_user.robot
similarity index 100%
rename from tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_auth_type_oauth_normal_user.robot
rename to tests/robot/AUTH_TYPE_TESTS/OAUTH/suite_with_oauth_normal_user.robot