diff --git a/acl/src/test/java/org/springframework/security/acls/expression/AclPermissionEvaluatorTests.java b/acl/src/test/java/org/springframework/security/acls/expression/AclPermissionEvaluatorTests.java
index feb520af37..2599c8afd2 100644
--- a/acl/src/test/java/org/springframework/security/acls/expression/AclPermissionEvaluatorTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/expression/AclPermissionEvaluatorTests.java
@@ -1,15 +1,12 @@
 package org.springframework.security.acls.expression;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
-import java.util.List;
-
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.acls.Acl;
 import org.springframework.security.acls.AclService;
-import org.springframework.security.acls.expression.AclPermissionEvaluator;
 import org.springframework.security.acls.objectidentity.ObjectIdentity;
 import org.springframework.security.acls.objectidentity.ObjectIdentityRetrievalStrategy;
 import org.springframework.security.acls.sid.SidRetrievalStrategy;
@@ -22,30 +19,22 @@ import org.springframework.security.core.Authentication;
  * @since 2.5
  */
 public class AclPermissionEvaluatorTests {
-    Authentication user;
-    private AclService service;
-    private ObjectIdentityRetrievalStrategy oidStrategy;
-    private SidRetrievalStrategy sidStrategy;
-
-    @Before
-    public void setup() throws Exception {
-        user = mock(Authentication.class);
-        service = mock(AclService.class);
-        oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-        sidStrategy = mock(SidRetrievalStrategy.class);
-    }
 
     @Test
     @SuppressWarnings("unchecked")
     public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
+        AclService service = mock(AclService.class);
         AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
-        final Acl acl = mock(Acl.class);
+        ObjectIdentity oid = mock(ObjectIdentity.class);
+        ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
+        when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
         pe.setObjectIdentityRetrievalStrategy(oidStrategy);
-        pe.setSidRetrievalStrategy(sidStrategy);
+        pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+        Acl acl = mock(Acl.class);
 
-        when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(acl);
-        when(acl.isGranted(any(List.class), any(List.class), false)).thenReturn(true);
+        when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
+        when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
 
-        assertTrue(pe.hasPermission(user, new Object(), "READ"));
+        assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ"));
     }
 }