diff --git a/nodepool/tests/fixtures/aws/diskimage.yaml b/nodepool/tests/fixtures/aws/diskimage.yaml
index 14c9a9748..c226f8334 100644
--- a/nodepool/tests/fixtures/aws/diskimage.yaml
+++ b/nodepool/tests/fixtures/aws/diskimage.yaml
@@ -64,3 +64,4 @@ diskimages:
       BASE_IMAGE_FILE: Fedora-Cloud-Base-20141029-21_Beta.x86_64.qcow2
     metadata:
       diskimage_metadata: diskimage
+    username: another_user
diff --git a/nodepool/tests/unit/test_driver_aws.py b/nodepool/tests/unit/test_driver_aws.py
index ea7e1f7d2..a5d353e84 100644
--- a/nodepool/tests/unit/test_driver_aws.py
+++ b/nodepool/tests/unit/test_driver_aws.py
@@ -715,7 +715,7 @@ class TestDriverAws(tests.DBTestCase):
         self.useBuilder(configfile)
 
         image = self.waitForImage('ec2-us-west-2', 'fake-image')
-        self.assertEqual(image.username, 'zuul')
+        self.assertEqual(image.username, 'another_user')
 
         ec2_image = self.ec2.Image(image.external_id)
         self.assertEqual(ec2_image.state, 'available')
@@ -742,6 +742,7 @@ class TestDriverAws(tests.DBTestCase):
         self.assertIsNotNone(node.launcher)
         self.assertEqual(node.connection_type, 'ssh')
         self.assertEqual(node.shell_type, None)
+        self.assertEqual(node.username, 'another_user')
         self.assertEqual(node.attributes,
                          {'key1': 'value1', 'key2': 'value2'})
         self.assertEqual(