diff --git a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
index 9e779808534d..f134fdde3b5e 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/JavaAwareTestConsoleProperties.java
@@ -32,6 +32,7 @@ import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.stacktrace.StackTraceLine;
 import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
 import com.intellij.openapi.diff.LineTokenizer;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
@@ -107,4 +108,8 @@ public abstract class JavaAwareTestConsoleProperties<T extends ModuleBasedConfig
     return null;
   }
 
+  @Override
+  public boolean isEditable() {
+    return Registry.is("editable.java.test.console");
+  }
 }
\ No newline at end of file
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 814886cf137d..7e2d16f2d5d6 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -942,3 +942,6 @@ typescript.service.node.arguments=
 typescript.service.node.arguments.description=Node options to use when starting TypeScript service process
 WebStorm.JavaScript.Modules.Diagram=false
 WebStorm.JavaScript.Modules.Diagram.description=Turns on module dependency diagram for javascript
+
+editable.java.test.console=true
+editable.java.test.console.description=Enables System.in in java test consoles (junit & testng)