Fix Spock's TestLifecycleAware
integration
#2563
Merged
TestLifecycleAware
integration
#2563