diff --git a/java/java-tests/testSrc/com/siyeh/ig/bugs/ClassNewInstanceInspectionTest.java b/java/java-tests/testSrc/com/siyeh/ig/bugs/ClassNewInstanceInspectionTest.java
index 8908e4a23454..9868a84fca59 100644
--- a/java/java-tests/testSrc/com/siyeh/ig/bugs/ClassNewInstanceInspectionTest.java
+++ b/java/java-tests/testSrc/com/siyeh/ig/bugs/ClassNewInstanceInspectionTest.java
@@ -1,7 +1,9 @@
 package com.siyeh.ig.bugs;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
+import com.intellij.testFramework.LightProjectDescriptor;
 import com.siyeh.ig.LightJavaInspectionTestCase;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ClassNewInstanceInspectionTest extends LightJavaInspectionTestCase {
@@ -17,10 +19,7 @@ public class ClassNewInstanceInspectionTest extends LightJavaInspectionTestCase
   }
 
   @Override
-  protected String[] getEnvironmentClasses() {
-    return new String[] {
-      "package java.lang;" +
-      "public class InstantiationException extends Exception {}"
-    };
+  protected @NotNull LightProjectDescriptor getProjectDescriptor() {
+    return JAVA_LATEST_WITH_LATEST_JDK;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/siyeh/ig/portability/HardcodedFileSeparatorsInspectionTest.java b/java/java-tests/testSrc/com/siyeh/ig/portability/HardcodedFileSeparatorsInspectionTest.java
index 1699b81ddb37..5b9ac6372e77 100644
--- a/java/java-tests/testSrc/com/siyeh/ig/portability/HardcodedFileSeparatorsInspectionTest.java
+++ b/java/java-tests/testSrc/com/siyeh/ig/portability/HardcodedFileSeparatorsInspectionTest.java
@@ -2,7 +2,9 @@
 package com.siyeh.ig.portability;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
+import com.intellij.testFramework.LightProjectDescriptor;
 import com.siyeh.ig.LightJavaInspectionTestCase;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -11,20 +13,8 @@ import org.jetbrains.annotations.Nullable;
 public class HardcodedFileSeparatorsInspectionTest extends LightJavaInspectionTestCase {
 
   @Override
-  protected String[] getEnvironmentClasses() {
-    return new String[] {
-      "package java.net;" +
-      "public final class URL implements java.io.Serializable { " +
-      "public URL(String spec) throws MalformedURLException { " +
-      " this(null, spec);" +
-      "}}",
-
-      "package java.net;" +
-      "public final class URI implements java.io.Serializable { " +
-      "public URI(String str) throws URISyntaxException { " +
-      " new Parser(str).parse(false);" +
-      "}}",
-    };
+  protected @NotNull LightProjectDescriptor getProjectDescriptor() {
+    return JAVA_LATEST_WITH_LATEST_JDK;
   }
 
   public void testHardcodedFileSeparators() {