diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyUnwrapTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyUnwrapTest.groovy
index f04c4df4ff05..bd261721ef94 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyUnwrapTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyUnwrapTest.groovy
@@ -16,9 +16,6 @@
 package org.jetbrains.plugins.groovy.lang
 
 import com.intellij.codeInsight.unwrap.UnwrapHandler
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiFile
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 
 /**
@@ -28,17 +25,7 @@ class GroovyUnwrapTest extends LightCodeInsightFixtureTestCase {
 
   private void assertUnwrapped(String codeBefore, String expectedCodeAfter) {
     myFixture.configureByText("A.groovy", codeBefore)
-
-    UnwrapHandler h = new UnwrapHandler() {
-      @Override
-      protected void selectOption(List<AnAction> options, Editor editor, PsiFile file) {
-        if (options.isEmpty()) return
-        options.get(0).actionPerformed(null)
-      }
-    }
-
-    h.invoke(project, myFixture.editor, myFixture.file)
-
+    new UnwrapHandler().invoke(project, myFixture.editor, myFixture.file)
     myFixture.checkResult(expectedCodeAfter)
   }