diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
index 8ea747cdb9d4..7bc5db4e5cf0 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
@@ -74,7 +74,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="5947e" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="5947e" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="5" left="5" bottom="5" right="5"/>
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
@@ -86,7 +86,7 @@
             <children>
               <component id="89ba4" class="com.intellij.openapi.ui.LabeledComponent" binding="myClass">
                 <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
@@ -95,7 +95,7 @@
               </component>
               <component id="b109" class="com.intellij.openapi.ui.LabeledComponent" binding="myMethod">
                 <constraints>
-                  <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
@@ -104,10 +104,10 @@
               </component>
               <vspacer id="c588d">
                 <constraints>
-                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
-              <grid id="27b84" binding="myPackagePanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+              <grid id="27b84" binding="myPackagePanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
                   <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -126,21 +126,10 @@
                       <visible value="true"/>
                     </properties>
                   </component>
-                  <component id="45b8" class="com.intellij.openapi.ui.LabeledComponent" binding="myPattern">
-                    <constraints>
-                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-                    </constraints>
-                    <properties>
-                      <componentClass value="javax.swing.JPanel"/>
-                      <enabled value="true"/>
-                      <text value="Pattern"/>
-                      <visible value="true"/>
-                    </properties>
-                  </component>
                   <grid id="c9a5f" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                     <margin top="0" left="0" bottom="0" right="0"/>
                     <constraints>
-                      <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties/>
                     <border type="none"/>
@@ -181,6 +170,17 @@
                   </grid>
                 </children>
               </grid>
+              <component id="45b8" class="com.intellij.openapi.ui.LabeledComponent" binding="myPattern">
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <componentClass value="javax.swing.JPanel"/>
+                  <enabled value="true"/>
+                  <text value="Pattern"/>
+                  <visible value="true"/>
+                </properties>
+              </component>
             </children>
           </grid>
         </children>
@@ -219,6 +219,7 @@
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
+            <properties/>
           </component>
         </children>
       </grid>
diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
index f00d5ac347af..75c9f6348d6b 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
@@ -195,24 +195,24 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> {
   private void changePanel () {
     if (myAllInPackageButton.isSelected()) {
       myPackagePanel.setVisible(true);
-      myPackage.setVisible(true);
       myPattern.setVisible(false);
       myClass.setVisible(false);
       myMethod.setVisible(false);
     }
     else if (myClassButton.isSelected()){
       myPackagePanel.setVisible(false);
+      myPattern.setVisible(false);
       myClass.setVisible(true);
       myMethod.setVisible(false);
     }
     else if (myTestMethodButton.isSelected()){
       myPackagePanel.setVisible(false);
+      myPattern.setVisible(false);
       myClass.setVisible(true);
       myMethod.setVisible(true);
     } else {
-      myPackagePanel.setVisible(true);
+      myPackagePanel.setVisible(false);
       myPattern.setVisible(true);
-      myPackage.setVisible(false);
       myClass.setVisible(false);
       myMethod.setVisible(false);
     }