diff --git a/test/langtools/tools/javac/api/T6395981.java b/test/langtools/tools/javac/api/TestGetSourceVersions.java
similarity index 82%
rename from test/langtools/tools/javac/api/T6395981.java
rename to test/langtools/tools/javac/api/TestGetSourceVersions.java
index 0ab7762ff72..ca005701e5a 100644
--- a/test/langtools/tools/javac/api/T6395981.java
+++ b/test/langtools/tools/javac/api/TestGetSourceVersions.java
@@ -28,10 +28,12 @@
  * @author  Peter von der Ah\u00e9
  * @modules java.compiler
  *          jdk.compiler
- * @run main/fail T6395981
- * @run main/fail T6395981 RELEASE_3 RELEASE_5 RELEASE_6
- * @run main/fail T6395981 RELEASE_0 RELEASE_1 RELEASE_2 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6
- * @run main T6395981 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6 RELEASE_7 RELEASE_8 RELEASE_9 RELEASE_10 RELEASE_11
+ * @run main/fail TestGetSourceVersions
+ * @run main/fail TestGetSourceVersions RELEASE_3  RELEASE_5  RELEASE_6
+ * @run main/fail TestGetSourceVersions RELEASE_0  RELEASE_1  RELEASE_2  RELEASE_3  RELEASE_4
+ *                                      RELEASE_5  RELEASE_6
+ * @run main TestGetSourceVersions      RELEASE_3  RELEASE_4  RELEASE_5  RELEASE_6  RELEASE_7
+ *                                      RELEASE_8  RELEASE_9  RELEASE_10 RELEASE_11
  */
 
 import java.util.EnumSet;
@@ -41,7 +43,7 @@
 import javax.tools.ToolProvider;
 import static javax.lang.model.SourceVersion.*;
 
-public class T6395981 {
+public class TestGetSourceVersions {
     public static void main(String... args) {
         Tool compiler = ToolProvider.getSystemJavaCompiler();
         Set<SourceVersion> expected = EnumSet.noneOf(SourceVersion.class);