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 20aff168149c..07ba7c0d7f5e 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
@@ -436,7 +436,7 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> implem
       getTestLocation(i).setEnabled(enabledFields.contains(i));
     /*if (newType == JUnitConfigurationModel.PATTERN) {
       myModule.setEnabled(false);
-    } else */if (newType != JUnitConfigurationModel.ALL_IN_PACKAGE) {
+    } else */if (newType != JUnitConfigurationModel.ALL_IN_PACKAGE && newType != JUnitConfigurationModel.PATTERN) {
       myModule.setEnabled(true);
     }
     else {
@@ -486,7 +486,8 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> implem
   }
 
   private void onScopeChanged() {
-    final boolean allInPackageAllInProject = ((Integer)myTypeChooser.getSelectedItem()) == JUnitConfigurationModel.ALL_IN_PACKAGE && myWholeProjectScope.isSelected();
+    final Integer selectedItem = (Integer)myTypeChooser.getSelectedItem();
+    final boolean allInPackageAllInProject = (selectedItem == JUnitConfigurationModel.ALL_IN_PACKAGE || selectedItem == JUnitConfigurationModel.PATTERN) && myWholeProjectScope.isSelected();
     myModule.setEnabled(!allInPackageAllInProject);
     if (allInPackageAllInProject) {
       myModule.getComponent().setSelectedItem(null);
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
index 91cc9bf75991..a7e498e6e18e 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
@@ -179,7 +179,6 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
           else if (buttonModel == patternTest.getModel()) {
             model.setType(TestType.PATTERN);
           }
-          redisplay();
         }
       }
     });
@@ -224,7 +223,11 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
   }
 
   private void evaluateModuleClassPath() {
-    moduleClasspath.setEnabled(!packagesInProject.isSelected());
+    final boolean allPackagesInProject = packagesInProject.isSelected() && packagePanel.isVisible();
+    moduleClasspath.setEnabled(!allPackagesInProject);
+    if (allPackagesInProject) {
+      moduleClasspath.getComponent().setSelectedItem(null);
+    }
   }
 
   private void redisplay() {
@@ -304,6 +307,7 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
     else {
       packagesInProject.setSelected(true);
     }
+    evaluateModuleClassPath();
     alternateJDK.init(config.ALTERNATIVE_JRE_PATH, config.ALTERNATIVE_JRE_PATH_ENABLED);
     propertiesList.clear();
     propertiesList.addAll(data.TEST_PROPERTIES.entrySet());
@@ -509,12 +513,6 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
 
   public void onTypeChanged(TestType type) {
     //LOGGER.info("onTypeChanged with " + type);
-    if (type != TestType.PACKAGE && type != TestType.SUITE) {
-      moduleClasspath.setEnabled(true);
-    }
-    else {
-      evaluateModuleClassPath();
-    }
     if (type == TestType.PACKAGE) {
       packageTest.setSelected(true);
       packageField.setEnabled(true);
@@ -569,6 +567,8 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
       methodField.setEnabled(false);
       groupField.setEnabled(false);
     }
+    redisplay();
+    evaluateModuleClassPath();
   }
 
   private class AddActionButtonRunnable implements AnActionButtonRunnable {