diff --git a/appveyor.yml b/appveyor.yml
index 33b6485d53..d2b21d51a5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,8 +24,8 @@ install:
   # Get the latest stable version of Node 0.STABLE.latest
   - ps: Install-Product node $env:nodejs_version
   # Typical npm stuff. Use msvs 2013 for the hiredis parser
-  - npm install hiredis --msvs_version=2013
   - npm install
+  - npm install hiredis --msvs_version=2013
 
 # Post-install test scripts.
 test_script:
diff --git a/test/commands/client.spec.js b/test/commands/client.spec.js
index 0d7f422673..db7a539ccb 100644
--- a/test/commands/client.spec.js
+++ b/test/commands/client.spec.js
@@ -67,18 +67,22 @@ describe("The 'client' method", function () {
                     client2.end(true);
                 });
 
-                it('sets the name', function (done) {
                     helper.serverVersionAtLeast.call(this, client, [2, 6, 9]);
 
+                    // The querys are auto pipelined and the response is a response to all querys of one client
+                    // per chunk. So the execution order is only garanteed on each client
+                    var end = helper.callFuncAfter(done, 2);
+
                     client.client("setname", "RUTH", helper.isString('OK'));
                     client2.client("setname", "RENEE", helper.isString('OK'));
                     client2.client("setname", "MARTIN", helper.isString('OK'));
                     client2.client("getname", function(err, res) {
                         assert.equal(res, 'MARTIN');
+                        end();
                     });
                     client.client("getname", function(err, res) {
                         assert.equal(res, 'RUTH');
-                        done();
+                        end();
                     });
                 });