diff --git a/Authors b/Authors
index afe7be3f8..31ced6e8e 100644
--- a/Authors
+++ b/Authors
@@ -119,6 +119,7 @@ Loganathan Parthipan <parthipan@hp.com>
 Lorin Hochstein <lorin@nimbisservices.com>
 Lvov Maxim <usrleon@gmail.com>
 Mandell Degerness <mdegerne@gmail.com>
+Mark McClain <mark.mcclain@dreamhost.com>
 Mark McLoughlin <markmc@redhat.com>
 Mark Washenberger <mark.washenberger@rackspace.com>
 Maru Newby <mnewby@internap.com>
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 2b46be867..473e1d5f9 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -242,14 +242,14 @@ class ApiEc2TestCase(test.TestCase):
                             "%Y-%m-%d %H:%M:%S.%f")
         self.assertEqual(
                         conv(time_to_convert),
-                        '2011-02-21T20:14:10Z')
+                        '2011-02-21T20:14:10.634Z')
         # mysqlite database representation
         time_to_convert = datetime.datetime.strptime(
                             "2011-02-21 19:56:18",
                             "%Y-%m-%d %H:%M:%S")
         self.assertEqual(
                         conv(time_to_convert),
-                        '2011-02-21T19:56:18Z')
+                        '2011-02-21T19:56:18.000Z')
 
     def test_xmlns_version_matches_request_version(self):
         self.expect_http(api_version='2010-10-30')