diff --git a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot
similarity index 95%
rename from robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot
rename to robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot
index 09cb90c..1805c00 100644
--- a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot
+++ b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot
@@ -41,12 +41,13 @@ Check Private Container
 
     ${OID} =            Put object      ${USER_WALLET}    ${FILE_S}    ${PRIV_CID}
     @{OBJECTS} =        Create List     ${OID}
+    ${SG} =             Put Storagegroup    ${USER_WALLET}  ${PRIV_CID}  ${OBJECTS}
 
                         Run Storage Group Operations And Expect Success
                         ...     ${USER_WALLET}    ${PRIV_CID}   ${OBJECTS}      ${RUN_TYPE}
 
                         Run Storage Group Operations And Expect Failure
-                        ...     ${OTHER_WALLET}    ${PRIV_CID}   ${OBJECTS}     ${RUN_TYPE}
+                        ...     ${OTHER_WALLET}    ${PRIV_CID}   ${OBJECTS}     ${SG}
 
     # In private container, Inner Ring is allowed to read (Storage Group List and Get),
     # so using here keyword for read-only container.
diff --git a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot
similarity index 100%
rename from robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot
rename to robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot
diff --git a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot
similarity index 100%
rename from robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot
rename to robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot
diff --git a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot
similarity index 100%
rename from robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot
rename to robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot
diff --git a/robot/testsuites/integration/object/object_storagegroup_complex.robot b/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot
similarity index 100%
rename from robot/testsuites/integration/object/object_storagegroup_complex.robot
rename to robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot
diff --git a/robot/testsuites/integration/object/object_storagegroup_simple.robot b/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot
similarity index 100%
rename from robot/testsuites/integration/object/object_storagegroup_simple.robot
rename to robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot