diff --git a/appveyor.yml b/appveyor.yml
index 78bb63bac2..33b6485d53 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,7 +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 --msvs_version=2013
+  - npm install hiredis --msvs_version=2013
+  - npm install
 
 # Post-install test scripts.
 test_script:
diff --git a/test/commands/client.spec.js b/test/commands/client.spec.js
index 49497b9973..0d7f422673 100644
--- a/test/commands/client.spec.js
+++ b/test/commands/client.spec.js
@@ -11,7 +11,7 @@ describe("The 'client' method", function () {
         var pattern = /addr=/;
 
         describe("using " + parser + " and " + ip, function () {
-            var client, client2;
+            var client;
 
             beforeEach(function (done) {
                 client = redis.createClient.apply(redis.createClient, args);
@@ -20,16 +20,8 @@ describe("The 'client' method", function () {
                 });
             });
 
-            beforeEach(function (done) {
-                client2 = redis.createClient.apply(redis.createClient, args);
-                client2.once("ready", function () {
-                    done();
-                });
-            });
-
             afterEach(function () {
                 client.end(true);
-                client2.end(true);
             });
 
             describe('list', function () {
@@ -62,6 +54,18 @@ describe("The 'client' method", function () {
             });
 
             describe('setname / getname', function () {
+                var client2;
+
+                beforeEach(function (done) {
+                    client2 = redis.createClient.apply(redis.createClient, args);
+                    client2.once("ready", function () {
+                        done();
+                    });
+                });
+
+                afterEach(function () {
+                    client2.end(true);
+                });
 
                 it('sets the name', function (done) {
                     helper.serverVersionAtLeast.call(this, client, [2, 6, 9]);