diff --git a/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy b/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
index ab72c14..e20f857 100644
--- a/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
+++ b/src/testFixtures/groovy/grails/plugin/geb/ContainerGebTestDescription.groovy
@@ -32,7 +32,13 @@ 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 ? testInfo.displayName : null,
+                testInfo.displayName != testInfo.feature.displayName ? testInfo.iterationIndex : null
+        ].findAll(/* Remove nulls */).join(' ')
+
         String safeName = testId.replaceAll('\\W+', '_')
         filesystemFriendlyName = safeName
     }