diff --git a/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy b/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
index ab72c14..7903efd 100644
--- a/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
+++ b/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
@@ -32,7 +32,8 @@ class ContainerGebTestDescription implements TestDescription {
     String filesystemFriendlyName
 
     ContainerGebTestDescription(IterationInfo testInfo) {
-        testId = testInfo.displayName
+
+        testId = [testInfo.feature.spec.displayName, testInfo.feature.displayName, testInfo.displayName == testInfo.feature.displayName ? null : testInfo.displayName, testInfo.displayName == testInfo.feature.displayName ? null : testInfo.iterationIndex].findAll{ it }.join(" ")
         String safeName = testId.replaceAll('\\W+', '_')
         filesystemFriendlyName = safeName
     }