diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs
index 38b376cb6808..2c7b66f75a67 100644
--- a/src/Testing/src/xunit/SkipOnHelixAttribute.cs
+++ b/src/Testing/src/xunit/SkipOnHelixAttribute.cs
@@ -66,7 +66,10 @@ private bool ShouldSkip()
             return true;
         }
 
-        return Queues.ToLowerInvariant().Split(';').Contains(targetQueue);
+        // We have "QueueName" and "QueueName.Open" queues for internal and public builds
+        // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa
+        return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue, StringComparison.Ordinal) || q.StartsWith(targetQueue, StringComparison.Ordinal) || 
+            targetQueue.StartsWith(q, StringComparison.Ordinal));
     }
 
     public static bool OnHelix() => HelixHelper.OnHelix();