diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java
index 13135110d3f1249d7846f0a0e669b9267365703a..8f72b8df6bcdf92f55300ef301ef4cbc49a2c15e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java
@@ -19,6 +19,8 @@ package ch.systemsx.cisd.openbis.generic.server.util;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -90,7 +92,16 @@ public class AnnotationAppliedTestCase extends AssertJUnit
         assertEquals(true, interfaceClass.isAssignableFrom(implementingClass));
 
         StringBuilder problems = new StringBuilder(noMissingAnnotationsMsg);
-        for (Method interfaceMethod : interfaceClass.getDeclaredMethods())
+        Method[] declaredMethods = interfaceClass.getDeclaredMethods();
+        Arrays.sort(declaredMethods, new Comparator<Method>()
+            {
+                @Override
+                public int compare(Method m0, Method m1)
+                {
+                    return m0.getName().compareTo(m1.getName());
+                }
+            });
+        for (Method interfaceMethod : declaredMethods)
         {
             List<String> missingAnnotations = new ArrayList<String>();
             for (Class<? extends Annotation> annotationClass : mandatoryAnnotations)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ServerInterfaceRegressionTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ServerInterfaceRegressionTest.java
index 903aa2335904f1fc8ea909b30a960c1535395197..478d5ede837e11f0a8409c2674e64990f45ae7f8 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ServerInterfaceRegressionTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/ServerInterfaceRegressionTest.java
@@ -37,6 +37,6 @@ public class ServerInterfaceRegressionTest extends AnnotationAppliedTestCase
     public void testApiServerAnnotations()
     {
         assertMandatoryMethodAnnotations(IScreeningApiServer.class, ScreeningServer.class,
-                "tryLoginScreening: RolesAllowed\n" + "logoutScreening: RolesAllowed\n");
+                "logoutScreening: RolesAllowed\n" + "tryLoginScreening: RolesAllowed\n");
     }
 }