diff --git a/lib/xml-template-builder.js b/lib/xml-template-builder.js
index ebc70724..4d5c9115 100644
--- a/lib/xml-template-builder.js
+++ b/lib/xml-template-builder.js
@@ -35,7 +35,7 @@ exports.buildBucketQuery = function(bucketName, options, data) {
     _attrs: { xmlns: "http://doc.s3.amazonaws.com/2006-03-01" },
     _content: [
       {
-        IsTruncated: options.isTruncated || false,
+        IsTruncated: data.isTruncated || false,
         Marker: options.marker || "",
         Name: bucketName,
         Prefix: options.prefix || "",
diff --git a/test/test.js b/test/test.js
index e20ef59a..15e4f08a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -727,6 +727,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);
+    expect(data.IsTruncated).to.be.false;
   });
 
   it("should list objects in a bucket filtered by a prefix", function*() {
@@ -913,18 +914,18 @@ describe("S3rver Tests", function() {
 
   it("should return one thousand small objects", function*() {
     yield generateTestObjects(s3Client, buckets[2], 2000);
-    const objects = yield s3Client
-      .listObjects({ Bucket: buckets[2] })
-      .promise();
-    expect(objects.Contents).to.have.lengthOf(1000);
+    const data = yield s3Client.listObjects({ Bucket: buckets[2] }).promise();
+    expect(data.IsTruncated).to.be.true;
+    expect(data.Contents).to.have.lengthOf(1000);
   });
 
   it("should return 500 small objects", function*() {
     yield generateTestObjects(s3Client, buckets[2], 1000);
-    const objects = yield s3Client
+    const data = yield s3Client
       .listObjects({ Bucket: buckets[2], MaxKeys: 500 })
       .promise();
-    expect(objects.Contents).to.have.lengthOf(500);
+    expect(data.IsTruncated).to.be.true;
+    expect(data.Contents).to.have.lengthOf(500);
   });
 
   it("should delete 500 small objects", function*() {