diff --git a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/model/Option.java b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/model/Option.java
index 7d313b8e..1e5c6194 100644
--- a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/model/Option.java
+++ b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/model/Option.java
@@ -16,6 +16,7 @@ public class Option {
     public String label;
     public String description;
     public boolean isAdvanced;
+    public boolean picked;
 
     public Option(String label) {
         this.label = label;
diff --git a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestGenerationUtils.java b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestGenerationUtils.java
index 652cce75..d50a014c 100644
--- a/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestGenerationUtils.java
+++ b/java-extension/com.microsoft.java.test.plugin/src/main/java/com/microsoft/java/test/plugin/util/TestGenerationUtils.java
@@ -563,7 +563,9 @@ private static List<String> determineMethodsToGenerate(List<String> lifecycleAnn
                 .map(annotation -> new Option(annotation, "@" + annotation, 
                         capitalize(getSuggestedMethodNameByAnnotation(annotation)) + " Method"))
                 .collect(Collectors.toList());
-        methodList.add(0, new Option("Test", "@Test", "Test Method"));
+        final Option testMethod = new Option("Test", "@Test", "Test Method");
+        testMethod.picked = true;
+        methodList.add(0, testMethod);
         return (List<String>) JUnitPlugin.askClientForChoice("Select methods to generate",
                 methodList, true /*pickMany*/);
     }