diff --git a/tests/ServiceStack.Redis.Tests/ConfigTests.cs b/tests/ServiceStack.Redis.Tests/ConfigTests.cs
index 507e82f5..419b8766 100644
--- a/tests/ServiceStack.Redis.Tests/ConfigTests.cs
+++ b/tests/ServiceStack.Redis.Tests/ConfigTests.cs
@@ -116,7 +116,7 @@ private static void AssertClient(RedisClient redis, RedisEndpoint expected)
         [Test]
         public void Does_set_Client_name_on_Connection()
         {
-            using (var redis = new RedisClient("localhost?Client=nunit"))
+            using (var redis = new RedisClient(TestConfig.SingleHost + "?Client=nunit"))
             {
                 var clientName = redis.GetClient();
 
@@ -127,7 +127,7 @@ public void Does_set_Client_name_on_Connection()
         [Test]
         public void Does_set_Client_on_Pooled_Connection()
         {
-            using (var redisManager = new PooledRedisClientManager("localhost?Client=nunit"))
+            using (var redisManager = new PooledRedisClientManager(TestConfig.SingleHost + "?Client=nunit"))
             using (var redis = redisManager.GetClient())
             {
                 var clientName = redis.GetClient();
diff --git a/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs b/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs
index d20db962..a6667148 100644
--- a/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs
+++ b/tests/ServiceStack.Redis.Tests/Examples/SimpleLocks.cs
@@ -123,7 +123,7 @@ public void AcquireLock_using_Tasks()
                     {
                         Console.WriteLine("About to process " + clientNo);
                         //var redisClient = new RedisClient("xxxx.redis.cache.windows.net", 6379, "xxxx");
-                        var redisClient = new RedisClient("localhost", 6379);
+                        var redisClient = new RedisClient(TestConfig.SingleHost, 6379);
 
                         using (redisClient.AcquireLock("testlock1", TimeSpan.FromMinutes(3)))
                         {
diff --git a/tests/ServiceStack.Redis.Tests/Issues/RedisCharacterizationTests.cs b/tests/ServiceStack.Redis.Tests/Issues/RedisCharacterizationTests.cs
index ff5ede4a..61a12bea 100644
--- a/tests/ServiceStack.Redis.Tests/Issues/RedisCharacterizationTests.cs
+++ b/tests/ServiceStack.Redis.Tests/Issues/RedisCharacterizationTests.cs
@@ -43,8 +43,8 @@ public void RedisManagerPool_WhenUsingADatabaseOnARedisConnectionString_CorrectD
 
         private void TestForDatabaseOnConnectionString(Func<string, IRedisClientsManager> factory)
         {
-            _db1ClientManager = factory("localhost?db=1");
-            _db2ClientManager = factory("localhost?db=2");
+            _db1ClientManager = factory(TestConfig.SingleHost + "?db=1");
+            _db2ClientManager = factory(TestConfig.SingleHost + "?db=2");
 
             using (var cacheClient = _db1ClientManager.GetCacheClient())
             {
@@ -59,8 +59,8 @@ private void TestForDatabaseOnConnectionString(Func<string, IRedisClientsManager
         [Test]
         public void WhenUsingAnInitialDatabase_CorrectDatabaseIsUsed()
         {
-            _db1ClientManager = new BasicRedisClientManager(1, "localhost");
-            _db2ClientManager = new BasicRedisClientManager(2, "localhost");
+            _db1ClientManager = new BasicRedisClientManager(1, TestConfig.SingleHost);
+            _db2ClientManager = new BasicRedisClientManager(2, TestConfig.SingleHost);
 
             using (var cacheClient = _db1ClientManager.GetCacheClient())
             {
diff --git a/tests/ServiceStack.Redis.Tests/TestConfig.cs b/tests/ServiceStack.Redis.Tests/TestConfig.cs
index 35417af1..0fb839d4 100644
--- a/tests/ServiceStack.Redis.Tests/TestConfig.cs
+++ b/tests/ServiceStack.Redis.Tests/TestConfig.cs
@@ -1,3 +1,4 @@
+using System;
 using ServiceStack.Logging;
 using ServiceStack.Support;
 
@@ -12,7 +13,10 @@ static TestConfig()
 
 		public const bool IgnoreLongTests = true;
 
-        public const string SingleHost = "localhost";
+	    public static string SingleHost
+	    {
+	        get { return Environment.GetEnvironmentVariable("CI_REDIS") ?? "localhost"; }
+	    }
         public static readonly string[] MasterHosts = new[] { "localhost" };
         public static readonly string[] SlaveHosts = new[] { "localhost" };