diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
index 8162b459651..abfc6560f45 100644
--- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
@@ -16,6 +16,7 @@
 
 package org.springframework.security.authentication;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.springframework.security.core.GrantedAuthority;
@@ -47,7 +48,13 @@ public TestingAuthenticationToken(Object principal, Object credentials, String..
 		this(principal, credentials, AuthorityUtils.createAuthorityList(authorities));
 	}
 
-	public TestingAuthenticationToken(Object principal, Object credentials, List<GrantedAuthority> authorities) {
+	public TestingAuthenticationToken(Object principal, Object credentials,
+			List<? extends GrantedAuthority> authorities) {
+		this(principal, credentials, (Collection<? extends GrantedAuthority>) authorities);
+	}
+
+	public TestingAuthenticationToken(Object principal, Object credentials,
+			Collection<? extends GrantedAuthority> authorities) {
 		super(authorities);
 		this.principal = principal;
 		this.credentials = credentials;
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithAnonymousUserSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithAnonymousUserSecurityContextFactory.java
index 1690ff1ecfe..63f3ac89706 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithAnonymousUserSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithAnonymousUserSecurityContextFactory.java
@@ -28,7 +28,7 @@
 import org.springframework.security.core.context.SecurityContextHolderStrategy;
 
 /**
- * A {@link WithAnonymousUserSecurityContextFactory} that runs with an
+ * A {@link WithSecurityContextFactory} that runs with an
  * {@link AnonymousAuthenticationToken}. .
  *
  * @author Rob Winch
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
index 6d567c88641..4016cac829a 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
@@ -33,7 +33,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * A {@link WithUserDetailsSecurityContextFactory} that works with {@link WithMockUser}.
+ * A {@link WithSecurityContextFactory} that works with {@link WithMockUser}.
  *
  * @author Rob Winch
  * @since 4.0
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
index b04e4f7e283..31ccbeaf0b5 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
@@ -34,8 +34,7 @@
 import org.springframework.util.StringUtils;
 
 /**
- * A {@link WithUserDetailsSecurityContextFactory} that works with {@link WithUserDetails}
- * .
+ * A {@link WithSecurityContextFactory} that works with {@link WithUserDetails} .
  *
  * @author Rob Winch
  * @since 4.0