diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
index dd35a31636..64580e03e5 100644
--- a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
+++ b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
@@ -348,6 +348,4 @@ s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resourc
 s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_wrong_resource_tag_deny
 s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resource_tag_princ_tag
 s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resource_tag_copy_obj
-s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_role_resource_tag
-s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
-s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
\ No newline at end of file
+s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_role_resource_tag
\ No newline at end of file
diff --git a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
index 6975014a04..bece7aafce 100644
--- a/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
+++ b/src/test/system_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
@@ -130,7 +130,6 @@ s3tests/functional/test_headers.py::test_object_create_bad_date_none_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_authorization_invalid_aws2
 s3tests/functional/test_headers.py::test_bucket_create_bad_date_none_aws2
 s3tests_boto3/functional/test_s3.py::test_post_object_wrong_bucket
-s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant
 s3tests_boto3/functional/test_s3.py::test_object_presigned_put_object_with_acl_tenant
 s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_newer_noncurrent
 s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_size_gt
diff --git a/src/util/http_utils.js b/src/util/http_utils.js
index 387db25a5a..fbaecb002e 100644
--- a/src/util/http_utils.js
+++ b/src/util/http_utils.js
@@ -719,8 +719,8 @@ function set_cors_headers_s3(req, res, cors_rules) {
         // https://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonResponseHeaders.html
         dbg.log0('set_cors_headers_s3: found matching CORS rule:', matched_rule);
         set_cors_headers(req, res, {
-            allow_origin: matched_rule.allowed_origins.includes('*') ? '*' : req.headers.origin,
-            allow_methods: matched_rule.allowed_methods.join(','),
+            allow_origin: match_origin,
+            allow_methods: match_method,
             allow_headers: matched_rule.allowed_headers?.join(','),
             expose_headers: matched_rule.expose_headers?.join(','),
             allow_credentials: 'true',