diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
index ca5a52c7fc..c08247d2f3 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/AbstractApexNode.java
@@ -14,7 +14,7 @@ public abstract class AbstractApexNode<T extends AstNode> extends AbstractNode i
     protected final T node;
 
     public AbstractApexNode(T node) {
-        super(node.getDefiningType().hashCode());
+        super(node.getClass().hashCode());
         this.node = node;
     }
 
diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
index 4410b0c13c..7bdddc3501 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ast/ApexTreeBuilder.java
@@ -10,7 +10,6 @@ import java.util.Map;
 import java.util.Stack;
 
 import apex.jorje.semantic.ast.AstNode;
-import apex.jorje.semantic.ast.compilation.AnonymousClass;
 import apex.jorje.semantic.ast.compilation.Compilation;
 import apex.jorje.semantic.ast.compilation.UserClass;
 import apex.jorje.semantic.ast.compilation.UserClassMethods;
@@ -100,8 +99,8 @@ public final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
 
     private static final Map<Class<? extends AstNode>, Constructor<? extends ApexNode<?>>> NODE_TYPE_TO_NODE_ADAPTER_TYPE = new HashMap<>();
     static {
-        register(Annotation.class, ASTAnnotation.class);
-        register(AnonymousClass.class, ASTAnonymousClass.class);
+    	register(Annotation.class, ASTAnnotation.class);
+    	register(AnnotationParameter.class, ASTAnnotationParameter.class);
         register(ArrayLoadExpression.class, ASTArrayLoadExpression.class);
         register(ArrayStoreExpression.class, ASTArrayStoreExpression.class);
         register(AssignmentExpression.class, ASTAssignmentExpression.class);
@@ -251,11 +250,6 @@ public final class ApexTreeBuilder extends AstVisitor<AdditionalPassScope> {
         }
     }
 
-    @Override
-    public boolean visit(AnonymousClass node, AdditionalPassScope scope) {
-        return visit(node);
-    }
-
     @Override
     public boolean visit(UserEnum node, AdditionalPassScope scope) {
         return visit(node);
diff --git a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
index fea9e1df5b..72b9d73af2 100644
--- a/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
+++ b/pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/ast/ApexParserTest.java
@@ -27,8 +27,8 @@ public class ApexParserTest {
     public void understandsSimpleFile() {
 
         // Setup
-        String code = "public class SimpleClass {\n"
-                + "    public void methodWithManyParams(String a, String b, String c, String d, String e, String f, String g) {\n"
+        String code = "@isTest\n public class SimpleClass {\n"
+                + "    @isTest\n public static void testAnything() {\n"
                 + "        \n" + "    }\n" + "}";
 
         // Exercise