diff --git a/src/yunit/TestAdapter.cs b/src/yunit/TestAdapter.cs
index 7c1c7ef..d88af4d 100644
--- a/src/yunit/TestAdapter.cs
+++ b/src/yunit/TestAdapter.cs
@@ -219,14 +219,15 @@ private static TestCase CreateTestCase(TestData data, Type type, MethodInfo meth
                 : $"{Path.GetFileName(data.FilePath)}/{data.Ordinal:D2}: [{data.Matrix}] {data.Summary}";
 
             var displayNameHash = Convert.ToBase64String(Encoding.UTF8.GetBytes(displayName));
+            var fullyQualifiedName = $"{type.FullName}.{method.Name}({attributeIndex},{displayNameHash})";
 
             var result = new TestCase
             {
                 LocalExtensionData = data,
-                FullyQualifiedName = $"{type.FullName}.{method.Name}({displayNameHash})",
+                FullyQualifiedName = fullyQualifiedName,
                 Source = source,
                 ExecutorUri = new Uri("executor://yunit"),
-                Id = CreateGuid($"{attributeIndex}/{displayName}"),
+                Id = CreateGuid(fullyQualifiedName),
                 DisplayName = displayName,
                 CodeFilePath = data.FilePath,
                 LineNumber = data.LineNumber,