diff --git a/bin/nova-manage b/bin/nova-manage
index 3ee18859..e3c3e70f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -623,7 +623,7 @@ class InstanceTypeCommands(object):
            arguments: name memory_mb vcpus local_gb"""
         try:
             instance_types.create(name, memory, vcpus, local_gb, flavorid)
-        except exception.InvalidInputException, e:
+        except exception.InvalidInputException:
             print "Must supply valid parameters to create instance type"
             sys.exit(1)
         except exception.DBError, e:
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index 81943176..283f0bce 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -14,7 +14,7 @@
 """
 Unit Tests for instance types code
 """
-import datetime
+import time
 
 from nova import context
 from nova import db
@@ -37,12 +37,10 @@ class InstanceTypeTestCase(test.TestCase):
         super(InstanceTypeTestCase, self).setUp()
         session = get_session()
         max_flavorid = session.query(models.InstanceTypes).\
-                                     order_by("flavorid desc").first()
+                                     order_by("flavorid desc").\
+                                     first()
         self.flavorid = max_flavorid["flavorid"] + 1
-        self.name = str(datetime.datetime.utcnow())
-
-    def tearDown(self):
-        pass
+        self.name = str(int(time.time()))
 
     def test_instance_type_create_then_delete(self):
         """Ensure instance types can be created"""