diff --git a/test/test.js b/test/test.js
index 955af604b4..a4c79e4f3b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,6 +1,6 @@
 /*global require console setTimeout process Buffer */
-var PORT = process.env.REDIS_1_PORT_6379_TCP_PORT || 6379;
-var HOST = process.env.REDIS_1_PORT_6379_TCP_ADDR || '127.0.0.1';
+var PORT = process.env.REDIS_PORT_6379_TCP_PORT || 6379;
+var HOST = process.env.REDIS_PORT_6379_TCP_ADDR || '127.0.0.1';
 var parser = process.argv[3];
 
 var redis = require("../index"),
@@ -116,7 +116,7 @@ next = function next(name) {
 // Tests are run in the order they are defined, so FLUSHDB should always be first.
 
 tests.IPV4 = function () {
-    var ipv4addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "127.0.0.1";
+    var ipv4addr = process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1";
     var ipv4Client = redis.createClient( PORT, ipv4addr, { family : "IPv4", parser: parser } );
 
     ipv4Client.once("ready", function start_tests() {
@@ -143,7 +143,7 @@ tests.IPV6 = function () {
         console.log("Skipping IPV6 for old Redis server version < 2.8.0");
         return run_next_test();
     }
-    var ipv6addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "::1";
+    var ipv6addr = process.env.REDIS_PORT_6379_TCP_ADDR || "::1";
     var ipv6Client = redis.createClient( PORT, ipv6addr, { family: "IPv6", parser: parser } );
 
     ipv6Client.once("ready", function start_tests() {