diff --git a/features/cloudformation/cloudformation.feature b/features/cloudformation/cloudformation.feature
index 13f92cfbc7..7b835fc9dc 100644
--- a/features/cloudformation/cloudformation.feature
+++ b/features/cloudformation/cloudformation.feature
@@ -17,5 +17,5 @@ Feature: AWS CloudFormation
   @pagination
   Scenario: Paginating responses
     Given I paginate the "listStacks" operation 
-    Then I should get 1 pages
+    Then I should get at least one page
     And the last page should not contain a marker
diff --git a/features/extra/hooks.js b/features/extra/hooks.js
index d134ea2ca7..db0ba2c667 100644
--- a/features/extra/hooks.js
+++ b/features/extra/hooks.js
@@ -13,7 +13,7 @@ module.exports = function () {
     if (this.sharedBucket) return callback();
 
     this.sharedBucket = this.uniqueName('aws-sdk-js-shared-integration');
-    this.request('s3', 'createBucket', {Bucket: this.sharedBucket}, function(err, data) {
+    this.request('s3', 'createBucket', {Bucket: this.sharedBucket}, function(err) {
       this.cacheBucketName(this.sharedBucket);
       if (err) callback.fail(err);
       else callback();
@@ -136,6 +136,11 @@ module.exports = function () {
     callback();
   });
 
+  this.Then(/^I should get at least one page$/, function(callback) {
+    this.assert.compare(this.numPages, '>=', 1);
+    callback();
+  });
+
   this.Then(/^I should get (\d+) pages$/, function(numPages, callback) {
     this.assert.equal(this.numPages, parseInt(numPages));
     callback();