diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index 4ef31525b189..16a435893cf8 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -45,6 +45,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
 
   public ApplicationConfigurable(final Project project) {
     myModuleSelector = new ConfigurationModuleSelector(project, myModule.getComponent());
+    myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
     myModule.getComponent().addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
index da04091b1750..e23f341ab296 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -51,6 +51,7 @@ public class CommonProgramParametersPanel extends JPanel {
   private EnvironmentVariablesComponent myEnvVariablesComponent;
 
   private Module myModuleContext = null;
+  private boolean myHaveModuleContext = false;
 
   public CommonProgramParametersPanel() {
     super();
@@ -83,7 +84,7 @@ public class CommonProgramParametersPanel extends JPanel {
     button.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         final List<String> macros = new ArrayList<String>(PathMacros.getInstance().getUserMacroNames());
-        if (myModuleContext != null) macros.add("MODULE_DIR");
+        if (myHaveModuleContext) macros.add("MODULE_DIR");
 
         final JList list = new JBList(ArrayUtil.toStringArray(macros));
         final JBPopup popup = JBPopupFactory.getInstance().createListPopupBuilder(list).setItemChoosenCallback(new Runnable() {
@@ -138,6 +139,7 @@ public class CommonProgramParametersPanel extends JPanel {
 
   public void setModuleContext(Module moduleContext) {
     myModuleContext = moduleContext;
+    myHaveModuleContext = true;
   }
 
   public LabeledComponent<RawCommandLineEditor> getProgramParametersComponent() {
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 f88e5360bbec..c192bdd3bc2f 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
@@ -111,6 +111,7 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> {
   public JUnitConfigurable(final Project project) {
     myModel = new JUnitConfigurationModel(project);
     myModuleSelector = new ConfigurationModuleSelector(project, getModulesComponent());
+    myCommonJavaParameters.setModuleContext(myModuleSelector.getModule());
     myModule.getComponent().addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         myCommonJavaParameters.setModuleContext(myModuleSelector.getModule());
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
index 43fe0877619c..1e45f59ea5ac 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
@@ -108,6 +108,12 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
     model.setListener(this);
     createView();
     moduleSelector = new ConfigurationModuleSelector(project, getModulesComponent());
+    commonJavaParameters.setModuleContext(moduleSelector.getModule());
+    moduleClasspath.getComponent().addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        commonJavaParameters.setModuleContext(moduleSelector.getModule());
+      }
+    });
     registerListener(new JRadioButton[] {packageTest, classTest, methodTest, groupTest, suiteTest}, new ChangeListener()
     {
       public void stateChanged(ChangeEvent e) {