diff --git a/src/main/resources/META-INF/jqassistant-rules/mockito.xml b/src/main/resources/META-INF/jqassistant-rules/mockito.xml
index 9c70f0e..b06fd39 100644
--- a/src/main/resources/META-INF/jqassistant-rules/mockito.xml
+++ b/src/main/resources/META-INF/jqassistant-rules/mockito.xml
@@ -11,12 +11,14 @@
             MATCH
                 (assertType:Java:Type)-[:DECLARES]->(assertMethod:Java:Method)
             WHERE
-                assertType.fqn = 'org.mockito.Mockito' and assertMethod.signature =~ '.* verify.*'
-                OR assertType.fqn = 'org.mockito.MockedStatic' and assertMethod.signature =~ '.* verify.*'
+                assertType.fqn in ['org.mockito.Mockito', 'org.mockito.MockedStatic']
+                and assertMethod.signature =~ '.* verify.*'
             SET
                 assertMethod:Mockito:Assert
             RETURN
                 assertMethod
+            ORDER BY
+               assertType.fqn, assertMethod.signature
         ]]></cypher>
     </concept>
 
@@ -36,6 +38,8 @@
                 assertMethod:Mockito:Assert
             RETURN
                 assertMethod
+            ORDER BY
+               type.fqn, assertMethod.signature
         ]]></cypher>
     </concept>
 
diff --git a/src/test/java/org/jqassistant/plugin/java_testing/concept/MockitoIT.java b/src/test/java/org/jqassistant/plugin/java_testing/concept/MockitoIT.java
index 6f2ff39..3b99c12 100644
--- a/src/test/java/org/jqassistant/plugin/java_testing/concept/MockitoIT.java
+++ b/src/test/java/org/jqassistant/plugin/java_testing/concept/MockitoIT.java
@@ -39,14 +39,14 @@ void mockitoVerifyMethod() throws Exception {
                 .getColumns()
                 .get("assertMethod")
                 .getValue()).asInstanceOf(type(MethodDescriptor.class))
-                .is(methodDescriptor(Mockito.class, "verify", Object.class));
+                .is(methodDescriptor(MockedStatic.class, "verify", MockedStatic.Verification.class));
 
         assertThat(conceptResult.getRows()
                 .get(1)
                 .getColumns()
                 .get("assertMethod")
                 .getValue()).asInstanceOf(type(MethodDescriptor.class))
-                .is(methodDescriptor(MockedStatic.class, "verify", MockedStatic.Verification.class));
+                .is(methodDescriptor(Mockito.class, "verify", Object.class));
 
         final TestResult methodQueryResultForMockito = getMethodQueryResultForMockito();
         assertThat(methodQueryResultForMockito.getRows().size()).isEqualTo(2);