diff --git a/lib/controllers.js b/lib/controllers.js
index b1875313..82668449 100644
--- a/lib/controllers.js
+++ b/lib/controllers.js
@@ -344,7 +344,11 @@ module.exports = function(rootDirectory, logger, indexDocument, errorDocument) {
             results.objects.length,
             req.params.bucket
           );
-          const template = templateBuilder.buildBucketQuery(options, results);
+          const template = templateBuilder.buildBucketQuery(
+            req.params.bucket,
+            options,
+            results
+          );
           buildXmlResponse(res, 200, template);
         });
       }
diff --git a/lib/xml-template-builder.js b/lib/xml-template-builder.js
index c491672d..ebc70724 100644
--- a/lib/xml-template-builder.js
+++ b/lib/xml-template-builder.js
@@ -29,7 +29,7 @@ exports.buildBuckets = function(buckets) {
   );
 };
 
-exports.buildBucketQuery = function(options, data) {
+exports.buildBucketQuery = function(bucketName, options, data) {
   const xml = {
     _name: "ListBucketResult",
     _attrs: { xmlns: "http://doc.s3.amazonaws.com/2006-03-01" },
@@ -37,7 +37,7 @@ exports.buildBucketQuery = function(options, data) {
       {
         IsTruncated: options.isTruncated || false,
         Marker: options.marker || "",
-        Name: options.bucketName,
+        Name: bucketName,
         Prefix: options.prefix || "",
         MaxKeys: options.maxKeys
       },
diff --git a/test/test.js b/test/test.js
index 5e359f94..e20ef59a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -725,6 +725,7 @@ describe("S3rver Tests", function() {
       )
     );
     const data = yield s3Client.listObjects({ Bucket: buckets[1] }).promise();
+    expect(data.Name).to.equal(buckets[1]);
     expect(data.Contents).to.have.lengthOf(testObjects.length);
   });