diff --git a/lib/plugins/aws/lib/validateS3BucketName.js b/lib/plugins/aws/lib/validateS3BucketName.js
index 4db9530fb..22286324e 100644
--- a/lib/plugins/aws/lib/validateS3BucketName.js
+++ b/lib/plugins/aws/lib/validateS3BucketName.js
@@ -23,12 +23,12 @@ module.exports = {
           error = `Bucket name is shorter than 3 characters. ${bucketName}`;
         } else if (bucketName.length > 63) {
           error = `Bucket name is longer than 63 characters. ${bucketName}`;
+        } else if (/[A-Z]/.test(bucketName)) {
+          error = `Bucket name cannot contain uppercase letters. ${bucketName}`;
         } else if (/^[^a-z0-9]/.test(bucketName)) {
           error = `Bucket name must start with a letter or number. ${bucketName}`;
         } else if (/[^a-z0-9]$/.test(bucketName)) {
           error = `Bucket name must end with a letter or number. ${bucketName}`;
-        } else if (/[A-Z]/.test(bucketName)) {
-          error = `Bucket name cannot contain uppercase letters. ${bucketName}`;
         } else if (!/^[a-z0-9][a-z.0-9-]+[a-z0-9]$/.test(bucketName)) {
           error = `Bucket name contains invalid characters, [a-z.0-9-] ${bucketName}`;
         } else if (/\.{2,}/.test(bucketName)) {