diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index 04c09d9fa6a..a8a6ffe4104 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -761,6 +761,7 @@
         <copy todir=".idea" >
             <fileset dir="make/intellij" includes="**"/>
         </copy>
+        <replace file=".idea/ant.xml" token="@@@" value="${jtreg.home}"/>               
     </target>
 
     <!--
diff --git a/langtools/make/intellij/ant.xml b/langtools/make/intellij/ant.xml
index d9f93c08a47..dee4939b60c 100644
--- a/langtools/make/intellij/ant.xml
+++ b/langtools/make/intellij/ant.xml
@@ -6,6 +6,7 @@
         <property name="boot.java.home" value="$JDKPath$" />
         <property name="jtreg.tests" value="$FilePath$" />
         <property name="target.java.home" value="$JDKPath$" />
+        <property name="jtreg.home" value="@@@" />
         <property name="javac.debuglevel" value="source,lines,vars" />
         <property name="jtreg.jpda.jvmargs" value="-agentlib:jdwp=transport=dt_socket,server=n,address=localhost:5900,suspend=y" />
       </properties>
diff --git a/langtools/make/intellij/codeStyleSettings.xml b/langtools/make/intellij/codeStyleSettings.xml
new file mode 100644
index 00000000000..076a0fb657c
--- /dev/null
+++ b/langtools/make/intellij/codeStyleSettings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+        <option name="RIGHT_MARGIN" value="80" />
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+