diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 78d0d6da48d..172a549ba4d 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -275,15 +275,14 @@ def fake_get_image_service():
 
 
 class FakeToken(object):
-    # FIXME(sirp): let's not use id here
-    id = 0
+    id_count = 0
 
     def __getitem__(self, key):
         return getattr(self, key)
 
     def __init__(self, **kwargs):
-        FakeToken.id += 1
-        self.id = FakeToken.id
+        FakeToken.id_count += 1
+        self.id = FakeToken.id_count
         for k, v in kwargs.iteritems():
             setattr(self, k, v)