diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
index a620938830ef..c07294b60351 100644
--- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
+++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
@@ -203,8 +203,8 @@ public class CreateTestDialog extends DialogWrapper {
     }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_DOWN_MASK)),
                                 myTargetPackageField.getChildComponent());
 
-    myGenerateBeforeBox = new JCheckBox("setUp/@Before");
-    myGenerateAfterBox = new JCheckBox("tearDown/@After");
+    myGenerateBeforeBox = new JCheckBox(CodeInsightBundle.message("intention.create.test.dialog.setUp"));
+    myGenerateAfterBox = new JCheckBox(CodeInsightBundle.message("intention.create.test.dialog.tearDown"));
 
     myShowInheritedMethodsBox = new JCheckBox(CodeInsightBundle.message("intention.create.test.dialog.show.inherited"));
     myShowInheritedMethodsBox.addActionListener(new ActionListener() {
@@ -411,7 +411,9 @@ public class CreateTestDialog extends DialogWrapper {
     constr.gridy = gridy++;
     constr.gridx = 0;
     constr.weightx = 0;
-    panel.add(new JLabel(CodeInsightBundle.message("intention.create.test.dialog.select.methods")), constr);
+    final JLabel membersLabel = new JLabel(CodeInsightBundle.message("intention.create.test.dialog.select.methods"));
+    membersLabel.setLabelFor(myMethodsTable);
+    panel.add(membersLabel, constr);
 
     constr.gridx = 1;
     constr.weightx = 1;
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 4c4a14eb79b4..1a823a102b9e 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -230,8 +230,10 @@ intention.create.test.dialog.class.name=Class name:
 intention.create.test.dialog.super.class=Superclass:
 intention.create.test.dialog.choose.super.class=Choose Superclass
 intention.create.test.dialog.generate=Generate:
-intention.create.test.dialog.show.inherited=Show inherited methods
-intention.create.test.dialog.select.methods=Generate test methods for:
+intention.create.test.dialog.show.inherited=Show &inherited methods
+intention.create.test.dialog.setUp=set&Up/@Before
+intention.create.test.dialog.tearDown=tear&Down/@After
+intention.create.test.dialog.select.methods=Generate test &methods for:
 intention.create.test.dialog.library.not.found={0} library not found in the module
 intention.create.test.dialog.fix.library=Fix
 intention.create.test.dialog.java=Java