diff --git a/tests/StackExchange.Redis.Tests/EnvoyTests.cs b/tests/StackExchange.Redis.Tests/EnvoyTests.cs
index 5227b73dc..b76761096 100644
--- a/tests/StackExchange.Redis.Tests/EnvoyTests.cs
+++ b/tests/StackExchange.Redis.Tests/EnvoyTests.cs
@@ -38,6 +38,14 @@ public void TestBasicEnvoyConnection()
             {
                 Skip.Inconclusive("Envoy server not found.");
             }
+            catch (AggregateException)
+            {
+                Skip.Inconclusive("Envoy server not found.");
+            }
+            catch (RedisConnectionException) when (sb.ToString().Contains("It was not possible to connect to the redis server(s)"))
+            {
+                Skip.Inconclusive("Envoy server not found.");
+            }
         }
     }
 }