diff --git a/lib/cluster/index.js b/lib/cluster/index.js
index 473e8699..7b63f67b 100644
--- a/lib/cluster/index.js
+++ b/lib/cluster/index.js
@@ -135,13 +135,6 @@ Cluster.prototype.resetNodesRefreshInterval = function () {
  * @public
  */
 Cluster.prototype.connect = function () {
-  function readyHandler() {
-    this.setStatus('ready');
-    this.retryAttempts = 0;
-    this.executeOfflineCommands();
-    this.resetNodesRefreshInterval();
-  }
-
   var Promise = PromiseContainer.get();
   return new Promise(function (resolve, reject) {
     if (this.status === 'connecting' || this.status === 'connect' || this.status === 'ready') {
@@ -156,6 +149,14 @@ Cluster.prototype.connect = function () {
 
     this.connectionPool.reset(this.startupNodes);
 
+    function readyHandler() {
+      this.setStatus('ready');
+      this.retryAttempts = 0;
+      this.executeOfflineCommands();
+      this.resetNodesRefreshInterval();
+      resolve();
+    }
+
     var closeListener;
     var refreshListener = function () {
       this.removeListener('close', closeListener);
@@ -164,7 +165,7 @@ Cluster.prototype.connect = function () {
       if (this.options.enableReadyCheck) {
         this._readyCheck(function (err, fail) {
           if (err || fail) {
-            debug('Ready check failed (%s). Reconnecting...', err || fail)
+            debug('Ready check failed (%s). Reconnecting...', err || fail);
             if (this.status === 'connect') {
               this.disconnect(true);
             }
@@ -175,7 +176,6 @@ Cluster.prototype.connect = function () {
       } else {
         readyHandler.call(this);
       }
-      resolve();
     };
 
     closeListener = function () {
@@ -276,7 +276,7 @@ Cluster.prototype.quit = function (callback) {
 
   var Promise = PromiseContainer.get();
   if (status === 'wait') {
-    var ret = asCallback(Promise.resolve('OK'), callback)
+    var ret = asCallback(Promise.resolve('OK'), callback);
 
     // use setImmediate to make sure "close" event
     // being emitted after quit() is returned
@@ -530,9 +530,9 @@ Cluster.prototype.sendCommand = function (command, stream, node) {
             if (typeof to === 'function') {
               var nodes =
                   nodeKeys
-                  .map(function (key) {
-                    return _this.connectionPool.nodes.all[key];
-                  });
+                    .map(function (key) {
+                      return _this.connectionPool.nodes.all[key];
+                    });
               redis = to(nodes, command);
               if (Array.isArray(redis)) {
                 redis = utils.sample(redis);
@@ -603,7 +603,11 @@ Cluster.prototype.handleError = function (error, ttl, handlers) {
       timeout: this.options.retryDelayOnClusterDown,
       callback: this.refreshSlotsCache.bind(this)
     });
-  } else if (error.message === utils.CONNECTION_CLOSED_ERROR_MSG && this.options.retryDelayOnFailover > 0 && this.status === 'ready') {
+  } else if (
+    error.message === utils.CONNECTION_CLOSED_ERROR_MSG &&
+    this.options.retryDelayOnFailover > 0 &&
+    this.status === 'ready'
+  ) {
     this.delayQueue.push('failover', handlers.connectionClosed, {
       timeout: this.options.retryDelayOnFailover,
       callback: this.refreshSlotsCache.bind(this)
@@ -683,16 +687,16 @@ Cluster.prototype._readyCheck = function (callback) {
 };
 
 ['sscan', 'hscan', 'zscan', 'sscanBuffer', 'hscanBuffer', 'zscanBuffer']
-.forEach(function (command) {
-  Cluster.prototype[command + 'Stream'] = function (key, options) {
-    return new ScanStream(_.defaults({
-      objectMode: true,
-      key: key,
-      redis: this,
-      command: command
-    }, options));
-  };
-});
+  .forEach(function (command) {
+    Cluster.prototype[command + 'Stream'] = function (key, options) {
+      return new ScanStream(_.defaults({
+        objectMode: true,
+        key: key,
+        redis: this,
+        command: command
+      }, options));
+    };
+  });
 
 require('../transaction').addTransactionSupport(Cluster.prototype);
 
diff --git a/test/functional/cluster/connect.js b/test/functional/cluster/connect.js
index a2368e62..f20da4e2 100644
--- a/test/functional/cluster/connect.js
+++ b/test/functional/cluster/connect.js
@@ -75,6 +75,34 @@ describe('cluster:connect', function () {
     });
   });
 
+  it('should wait for ready state before resolving', function (done) {
+    var slotTable = [
+      [0, 16383, ['127.0.0.1', 30001]]
+    ];
+    var argvHandler = function (argv) {
+      if (argv[0] === 'info') {
+        // return 'role:master'
+      }
+      if (argv[0] === 'cluster' && argv[1] === 'slots') {
+        return slotTable;
+      }
+      if (argv[0] === 'cluster' && argv[1] === 'info') {
+        return 'cluster_state:ok';
+      }
+    };
+    var node = new MockServer(30001, argvHandler);
+
+    var cluster = new Redis.Cluster([
+      { host: '127.0.0.1', port: '30001' }
+    ], { lazyConnect: true });
+
+    cluster.connect().then(function () {
+      expect(cluster.status).to.eql('ready');
+      cluster.disconnect();
+      disconnect([node], done);
+    });
+  });
+
   it('should support url schema', function (done) {
     var node = new MockServer(30001);
 
@@ -249,6 +277,7 @@ describe('cluster:connect', function () {
       expect(err.message).to.eql(errorMessage);
       checkDone();
     });
+
     function checkDone() {
       if (!--pending) {
         cluster.disconnect();