diff --git a/languages/java/runnables.scm b/languages/java/runnables.scm
index a8a2b2e..7ad84dc 100644
--- a/languages/java/runnables.scm
+++ b/languages/java/runnables.scm
@@ -42,7 +42,7 @@
     (#set! tag java-main)
 )
 
-; Run test function
+; Run test function (marker annotation, e.g. @Test)
 (
     (package_declaration
         (scoped_identifier) @java_package_name
@@ -52,12 +52,15 @@
         body: (class_body
             (method_declaration
                 (modifiers
-                    (marker_annotation
+                    [(marker_annotation
                         name: (identifier) @annotation_name
                     )
+                    (annotation
+                        name: (identifier) @annotation_name
+                    )]
                 )
                 name: (identifier) @run @java_method_name
-                (#eq? @annotation_name "Test")
+                (#match? @annotation_name "Test$")
             )
         )
     ) @_
@@ -82,12 +85,15 @@
                 body: (class_body
                     (method_declaration
                         (modifiers
-                            (marker_annotation
+                            [(marker_annotation
                                 name: (identifier) @annotation_name
                                 )
+                            (annotation
+                                name: (identifier) @annotation_name
+                                )]
                             )
                         name: (identifier) @run @java_method_name
-                        (#eq? @annotation_name "Test")
+                        (#match? @annotation_name "Test$")
                     )
                 )
                 (#eq? @nested_annotation "Nested")
@@ -107,11 +113,14 @@
         body: (class_body
             (method_declaration
                 (modifiers
-                    (marker_annotation
+                    [(marker_annotation
                         name: (identifier) @annotation_name
                     )
+                    (annotation
+                        name: (identifier) @annotation_name
+                    )]
                 )
-                (#eq? @annotation_name "Test")
+                (#match? @annotation_name "Test$")
             )
         )
     ) @_
@@ -136,11 +145,14 @@
                 body: (class_body
                     (method_declaration
                         (modifiers
-                            (marker_annotation
+                            [(marker_annotation
                                 name: (identifier) @annotation_name
                                 )
+                            (annotation
+                                name: (identifier) @annotation_name
+                                )]
                             )
-                        (#eq? @annotation_name "Test")
+                        (#match? @annotation_name "Test$")
                     )
                 )
                 (#eq? @nested_annotation "Nested")