diff --git a/make/langtools/test/crules/DefinedByAnalyzer/Test.java b/make/langtools/test/crules/DefinedByAnalyzer/Test.java
index 901d7d9b1ae..9900504f7a5 100644
--- a/make/langtools/test/crules/DefinedByAnalyzer/Test.java
+++ b/make/langtools/test/crules/DefinedByAnalyzer/Test.java
@@ -12,14 +12,10 @@ import com.sun.tools.javac.util.DefinedBy.Api;
 
 public class Test implements SourcePositions, TaskListener {
     @Override @DefinedBy(Api.COMPILER_TREE)
-    public long getStartPosition(CompilationUnitTree file, Tree tree) {
+    public long getStartPosition(Tree tree) {
         return 0;
     }
-    @Override
-    public long getEndPosition(CompilationUnitTree file, Tree tree) {
-        return 0;
-    }
-    @DefinedBy(Api.COMPILER_TREE)
+    @Override @DefinedBy(Api.COMPILER_TREE)
     public long getEndPosition(Tree tree) {
         return 0;
     }
diff --git a/test/langtools/tools/javac/api/8007344/Test.java b/test/langtools/tools/javac/api/8007344/Test.java
index b8d4a8bb49f..fc4941c7a43 100644
--- a/test/langtools/tools/javac/api/8007344/Test.java
+++ b/test/langtools/tools/javac/api/8007344/Test.java
@@ -225,8 +225,8 @@ public class Test {
         }
 
         void checkEndPos(CompilationUnitTree unit, Tree tree) {
-            long sp = srcPosns.getStartPosition(unit, tree);
-            long ep = srcPosns.getEndPosition(unit, tree);
+            long sp = srcPosns.getStartPosition(tree);
+            long ep = srcPosns.getEndPosition(tree);
             if (sp >= 0 && ep == Position.NOPOS) {
                 error("endpos not set for " + tree.getKind()
                         + " " + Pretty.toSimpleString(((JCTree) tree))
diff --git a/test/langtools/tools/javac/api/T6412669.java b/test/langtools/tools/javac/api/T6412669.java
index 03df8df461f..9c3d6497d91 100644
--- a/test/langtools/tools/javac/api/T6412669.java
+++ b/test/langtools/tools/javac/api/T6412669.java
@@ -81,8 +81,8 @@ public class T6412669 extends AbstractProcessor {
             for (Element e: roundEnv.getElementsAnnotatedWith(anno)) {
                 m.printNote("    processing element " + e);
                 TreePath p = trees.getPath(e);
-                long start = sp.getStartPosition(p.getCompilationUnit(), p.getLeaf());
-                long end = sp.getEndPosition(p.getCompilationUnit(), p.getLeaf());
+                long start = sp.getStartPosition(p.getLeaf());
+                long end = sp.getEndPosition(p.getLeaf());
                 Diagnostic.Kind k = (start > 0 && end > 0 && start < end
                                      ? Diagnostic.Kind.NOTE : Diagnostic.Kind.ERROR);
                 m.printMessage(k, "test [" + start + "," + end + "]", e);
diff --git a/test/langtools/tools/javac/doctree/positions/TestPosition.java b/test/langtools/tools/javac/doctree/positions/TestPosition.java
index 6d66a84d83b..f10a0f3803f 100644
--- a/test/langtools/tools/javac/doctree/positions/TestPosition.java
+++ b/test/langtools/tools/javac/doctree/positions/TestPosition.java
@@ -78,8 +78,8 @@ public class TestPosition extends AbstractProcessor {
                         @Override public Void scan(DocTree node, Void p) {
                             if (node != null) {
                                 DocSourcePositions sp = trees.getSourcePositions();
-                                int start = (int) sp.getStartPosition(testElement.getCompilationUnit(), docCommentTree, node);
-                                int end   = (int) sp.getEndPosition(testElement.getCompilationUnit(), docCommentTree, node);
+                                int start = (int) sp.getStartPosition(docCommentTree, node);
+                                int end   = (int) sp.getEndPosition(docCommentTree, node);
                                 String snippet = code.substring(start, end).replace(" \n", "!trailing-whitespace!\n");
 
                                 if (snippet.endsWith(" ")) {
diff --git a/test/langtools/tools/javac/patterns/PatternMatchPosTest.java b/test/langtools/tools/javac/patterns/PatternMatchPosTest.java
index a9ab0e6fadf..79fcc216129 100644
--- a/test/langtools/tools/javac/patterns/PatternMatchPosTest.java
+++ b/test/langtools/tools/javac/patterns/PatternMatchPosTest.java
@@ -83,8 +83,8 @@ public class PatternMatchPosTest extends AbstractProcessor {
                     if (tree == null)
                         return null;
                     if (print) {
-                        int start = (int) sp.getStartPosition(dataPath.getCompilationUnit(), tree);
-                        int end = (int) sp.getEndPosition(dataPath.getCompilationUnit(), tree);
+                        int start = (int) sp.getStartPosition(tree);
+                        int end = (int) sp.getEndPosition(tree);
                         if (start != (-1) || end != (-1)) {
                             processingEnv.getMessager().printNote(text.substring(start, end));
                         }
diff --git a/test/langtools/tools/javac/tree/TreePosRoundsTest.java b/test/langtools/tools/javac/tree/TreePosRoundsTest.java
index 7ba12aa88e2..2595692f8b3 100644
--- a/test/langtools/tools/javac/tree/TreePosRoundsTest.java
+++ b/test/langtools/tools/javac/tree/TreePosRoundsTest.java
@@ -159,13 +159,13 @@ public class TreePosRoundsTest extends AbstractProcessor {
             }
             //System.err.println("expect: " + expect);
 
-            int start = (int)sourcePositions.getStartPosition(unit, tree);
+            int start = (int)sourcePositions.getStartPosition(tree);
             if (start == Diagnostic.NOPOS) {
                 messager.printError("start pos not set for " + trim(tree));
                 return;
             }
 
-            int end = (int)sourcePositions.getEndPosition(unit, tree);
+            int end = (int)sourcePositions.getEndPosition(tree);
             if (end == Diagnostic.NOPOS) {
                 messager.printError("end pos not set for " + trim(tree));
                 return;