diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
index 9e40c31a8726..c79dfd8b5f6d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerationTest.groovy
@@ -42,7 +42,7 @@ public class CodeBlockGenerationTest extends LightCodeInsightFixtureTestCase {
     @Override
     public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) {
       final Library.ModifiableModel modifiableModel = model.moduleLibraryTable.createLibrary("GROOVY").modifiableModel;
-      final VirtualFile groovyJar = JarFileSystem.instance.refreshAndFindFileByPath(TestUtils.mockGroovy1_7LibraryName + "!/");
+      final VirtualFile groovyJar = JarFileSystem.instance.refreshAndFindFileByPath("$TestUtils.mockGroovy1_7LibraryName!/");
       modifiableModel.addRoot(groovyJar, OrderRootType.CLASSES);
       modifiableModel.commit();
     }
@@ -56,12 +56,12 @@ public class CodeBlockGenerationTest extends LightCodeInsightFixtureTestCase {
 
   @Override
   protected String getBasePath() {
-    return TestUtils.testDataPath + "refactoring/convertGroovyToJava/codeBlock";
+    return "${TestUtils.testDataPath}refactoring/convertGroovyToJava/codeBlock";
   }
 
   private void doTest() {
     final String testName = getTestName(true)
-    final PsiFile file = myFixture.configureByFile(testName + ".groovy");
+    final PsiFile file = myFixture.configureByFile("${testName}.groovy");
     assertInstanceOf file, GroovyFile
 
     GrTopStatement[] statements = file.topStatements
@@ -69,13 +69,13 @@ public class CodeBlockGenerationTest extends LightCodeInsightFixtureTestCase {
     def generator = new CodeBlockGenerator(builder, new ExpressionContext(project));
     for (def statement: statements) {
       statement.accept(generator);
-      builder.append("\n")
+      builder.append('\n')
     }
 
-    final PsiFile result = createLightFile(testName + ".java", StdLanguages.JAVA, builder.toString())
+    final PsiFile result = createLightFile("${testName}.java", StdLanguages.JAVA, builder.toString())
     PostprocessReformattingAspect.getInstance(project).doPostponedFormatting()
     final String text = result.text
-    final String expected = psiManager.findFile(myFixture.copyFileToProject(testName + ".java")).text
+    final String expected = psiManager.findFile(myFixture.copyFileToProject("${testName}.java")).text
     assertEquals expected, text
   }
 
@@ -93,7 +93,7 @@ public class CodeBlockGenerationTest extends LightCodeInsightFixtureTestCase {
   void _testWhile3() {doTest()}
 
   void testRefExpr() {
-    myFixture.addFileToProject "Bar.groovy", """
+    myFixture.addFileToProject 'Bar.groovy', '''
 class Bar {
   def foo = 2
 
@@ -104,7 +104,7 @@ class MyCat {
     return 4
   }
 }
-"""
+'''
 
     doTest()
   }
@@ -112,10 +112,10 @@ class MyCat {
   void testMemberPointer() {doTest()}
 
   void testCompareMethods() {
-    addFile """
+    addFile '''
 class Bar {
   def compareTo(def other) {1}
-}"""
+}'''
   }
 
   void testPrefixInc() {
@@ -128,7 +128,7 @@ class Bar {
 
 class Upper {
     private test=new Test()
-    def getTest(){println "getTEst"; test}
+    def getTest(){println "getTest"; test}
 }
 
 class Test {
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.groovy b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.groovy
index 1e7b00841236..98a30811d181 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.groovy
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.groovy
@@ -2,5 +2,3 @@ def upper = new Upper();
 println(++upper.test.bar);
 def test=new Test()
 ++test.state
-def foo = 2
-++foo
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.java
index be486131a281..fdea2abfaad2 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/codeBlock/prefixInc.java
@@ -2,5 +2,3 @@ Upper upper = new Upper();
 println(upper.getTest().setBar(upper.getTest().getBar().next()));
 Test test = new Test();
 (test.state = test.state.next());
-java.lang.Integer foo = 2;
-(foo = org.codehaus.groovy.runtime.DefaultGroovyMethods.next(foo));