diff --git a/nova/test.py b/nova/test.py
index 0329383b8..d8a47464f 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -48,14 +48,6 @@ flags.DEFINE_bool('fake_tests', True,
                   'should we use everything for testing')
 
 
-INSTANCE_TYPES = {
-    'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
-    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
-    'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
-    'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
-    'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
-
-
 def skip_if_fake(func):
     """Decorator that skips a test if running in fake mode"""
     def _skipper(*args, **kw):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 27131c45e..106c0bd6f 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -233,7 +233,7 @@ class XenAPIVMTestCase(test.TestCase):
         vm = vms[0]
 
         # Check that m1.large above turned into the right thing.
-        instance_type = test.INSTANCE_TYPES['m1.large']
+        instance_type = db.instance_type_get_by_name(conn, 'm1.large')
         mem_kib = long(instance_type['memory_mb']) << 10
         mem_bytes = str(mem_kib << 10)
         vcpus = instance_type['vcpus']