diff --git a/sap-abap/services/s3/zcl_aws1_s3_actions.clas.testclasses.abap b/sap-abap/services/s3/zcl_aws1_s3_actions.clas.testclasses.abap
index 97e5e856875..1db6f7d0b09 100644
--- a/sap-abap/services/s3/zcl_aws1_s3_actions.clas.testclasses.abap
+++ b/sap-abap/services/s3/zcl_aws1_s3_actions.clas.testclasses.abap
@@ -52,7 +52,7 @@ CLASS ltc_zcl_aws1_s3_actions IMPLEMENTATION.
     ao_s3_actions = NEW zcl_aws1_s3_actions( ).
   ENDMETHOD.
   METHOD create_bucket.
-    CONSTANTS cv_bucket TYPE /aws1/s3_bucketname VALUE 'code-example-create-bucket'.
+    CONSTANTS cv_bucket TYPE /aws1/s3_bucketname VALUE 'amzn-s3-demo-bucket'.
     ao_s3_actions->create_bucket( iv_bucket_name = cv_bucket ).
 
     assert_bucket_exists(
@@ -152,9 +152,9 @@ CLASS ltc_zcl_aws1_s3_actions IMPLEMENTATION.
         ).
   ENDMETHOD.
   METHOD copy_object.
-    CONSTANTS cv_src_bucket TYPE /aws1/s3_bucketname VALUE 'code-example-copy-object-src-bucket'.
+    CONSTANTS cv_src_bucket TYPE /aws1/s3_bucketname VALUE 'amzn-s3-demo-copy-object-src-bucket'.
     ao_s3->createbucket( iv_bucket = cv_src_bucket ).
-    CONSTANTS cv_dest_bucket TYPE /aws1/s3_bucketname VALUE 'code-example-copy-object-dest-bucket'.
+    CONSTANTS cv_dest_bucket TYPE /aws1/s3_bucketname VALUE 'amzn-s3-demo-copy-object-dest-bucket'.
     ao_s3->createbucket( iv_bucket = cv_dest_bucket ).
 
     CONSTANTS cv_src_file TYPE /aws1/s3_objectkey VALUE 'copy_object_ex_file'.
@@ -283,7 +283,7 @@ CLASS ltc_zcl_aws1_s3_actions IMPLEMENTATION.
 
   ENDMETHOD.
   METHOD delete_bucket.
-    CONSTANTS cv_bucket TYPE /aws1/s3_bucketname VALUE 'code-example-delete-bucket'.
+    CONSTANTS cv_bucket TYPE /aws1/s3_bucketname VALUE 'amzn-s3-demo-bucket'.
     ao_s3->createbucket( iv_bucket = cv_bucket ).
     ao_s3_actions->delete_bucket( iv_bucket_name =  cv_bucket ).
 
diff --git a/sap-abap/services/s3/zcl_aws1_s3_scenario.clas.testclasses.abap b/sap-abap/services/s3/zcl_aws1_s3_scenario.clas.testclasses.abap
index d7a8fa6c29d..94d65d7f80e 100644
--- a/sap-abap/services/s3/zcl_aws1_s3_scenario.clas.testclasses.abap
+++ b/sap-abap/services/s3/zcl_aws1_s3_scenario.clas.testclasses.abap
@@ -8,7 +8,7 @@ CLASS ltc_zcl_aws1_s3_scenario DEFINITION FOR TESTING  DURATION SHORT RISK LEVEL
 
   PRIVATE SECTION.
     CONSTANTS: cv_pfl            TYPE /aws1/rt_profile_id VALUE 'ZCODE_DEMO',
-               cv_bucket         TYPE /aws1/s3_bucketname VALUE 'code-example-scenario-bucket',
+               cv_bucket         TYPE /aws1/s3_bucketname VALUE 'amzn-s3-demo-bucket',
                cv_file           TYPE /aws1/s3_objectkey VALUE 's3_scenario_ex_file',
                cv_copy_to_folder TYPE /aws1/s3_bucketname VALUE 'code-example-scenario-folder'.