diff --git a/trove/instance/models.py b/trove/instance/models.py
index 81a845b574..b09829224a 100644
--- a/trove/instance/models.py
+++ b/trove/instance/models.py
@@ -130,7 +130,8 @@ class SimpleInstance(object):
 
     @property
     def flavor_id(self):
-        return self.db_info.flavor_id
+        # Flavor ID is a str in the 1.0 API.
+        return str(self.db_info.flavor_id)
 
     @property
     def hostname(self):
diff --git a/trove/tests/api/mgmt/instances.py b/trove/tests/api/mgmt/instances.py
index 8fdf8d9d9c..3330d0d973 100644
--- a/trove/tests/api/mgmt/instances.py
+++ b/trove/tests/api/mgmt/instances.py
@@ -36,10 +36,6 @@ from trove.tests.api.instances import GROUP_TEST
 from trove.tests.util import poll_until
 
 GROUP = "dbaas.api.mgmt.instances"
-XML_SUPPORT = False
-if hasattr(CONFIG, 'trove_client_cls'):
-    if CONFIG.trove_client_cls == "troveclient.xml.TroveXmlClient":
-        XML_SUPPORT = True
 
 
 @test(groups=[GROUP])
@@ -52,10 +48,7 @@ def mgmt_index_requires_admin_account():
 # These functions check some dictionaries in the returned response.
 def flavor_check(flavor):
     with CollectionCheck("flavor", flavor) as check:
-        if XML_SUPPORT:
-            check.has_element("id", basestring)
-        else:
-            check.has_element("id", int)
+        check.has_element("id", basestring)
         check.has_element("links", list)