diff -r b61e5f801f7c -r 8943b4213f59 test/tools/sjavac/SJavac.java
--- a/test/tools/sjavac/SJavac.java	Tue Jan 22 16:39:51 2013 +0000
+++ b/test/tools/sjavac/SJavac.java	Tue Jan 22 18:43:22 2013 -0800
@@ -21,16 +21,6 @@
  * questions.
  */
 
-/*
- * @test
- * @summary Test all aspects of sjavac.
- *
- * @bug 8004658
- * @summary Add internal smart javac wrapper to solve JEP 139
- *
- * @run main SJavac
- */
-
 import java.util.*;
 import java.io.*;
 import java.net.*;
@@ -44,13 +34,6 @@
 class SJavac {
 
     public static void main(String... args) throws Exception {
-        URL url = SJavac.class.getClassLoader().getResource("com/sun/tools/sjavac/Main.class");
-        if (url == null) {
-            // No sjavac in the classpath.
-            System.out.println("pass by default");
-            return;
-        }
-
         SJavac s = new SJavac();
         s.test();
     }