diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
index 2660407b85..9e1f952fe5 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/compute/functions/ImageParser.java
@@ -60,7 +60,11 @@ public class ImageParser implements Function<org.jclouds.aws.ec2.domain.Image, I
    @Inject
    private PopulateDefaultLoginCredentialsForImageStrategy authenticator;
 
-   @Override
+   public void setAuthenticator(PopulateDefaultLoginCredentialsForImageStrategy authenticator) {
+       this.authenticator = authenticator;
+   }
+
+    @Override
    public Image apply(org.jclouds.aws.ec2.domain.Image from) {
       if (from.getImageLocation().indexOf("test") != -1) {
          logger.trace("skipping test image(%s)", from.getId());
diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/functions/ImageParserTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/functions/ImageParserTest.java
index d576881f4e..bb3e2d9025 100644
--- a/aws/core/src/test/java/org/jclouds/aws/ec2/functions/ImageParserTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/ec2/functions/ImageParserTest.java
@@ -28,6 +28,7 @@ import java.util.Set;
 
 import org.jclouds.aws.domain.Region;
 import org.jclouds.aws.ec2.compute.functions.ImageParser;
+import org.jclouds.aws.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
 import org.jclouds.aws.ec2.domain.Image;
 import org.jclouds.aws.ec2.xml.DescribeImagesResponseHandler;
 import org.jclouds.compute.domain.OsFamily;
@@ -52,6 +53,7 @@ public class ImageParserTest extends BaseHandlerTest {
       assertEquals(result.size(), 6);
 
       ImageParser parser = new ImageParser();
+      parser.setAuthenticator(new EC2PopulateDefaultLoginCredentialsForImageStrategy());
       org.jclouds.compute.domain.Image ubuntuHardy = parser.apply(Iterables.get(result, 0));
 
       assertEquals(ubuntuHardy.getArchitecture(), org.jclouds.compute.domain.Architecture.X86_32);
@@ -125,6 +127,7 @@ public class ImageParserTest extends BaseHandlerTest {
       Set<Image> result = parseImages(is);
 
       ImageParser parser = new ImageParser();
+      parser.setAuthenticator(new EC2PopulateDefaultLoginCredentialsForImageStrategy());
 
       org.jclouds.compute.domain.Image image = parser.apply(Iterables.get(result, 0));