diff --git a/trove/tests/tempest/config.py b/trove/tests/tempest/config.py
index 5e2586b20e..51e7c014f4 100644
--- a/trove/tests/tempest/config.py
+++ b/trove/tests/tempest/config.py
@@ -14,9 +14,14 @@
 
 from oslo_config import cfg
 
-service_option = cfg.BoolOpt('trove', default=True,
-                             help="Whether or not Trove is expected to be "
-                                  "available")
+ServiceAvailableGroup = [
+    cfg.BoolOpt('trove',
+                default=True,
+                help="Whether or not Trove is expected to be available")
+]
+
+service_available_group = cfg.OptGroup(name='service_available',
+                                       title='Available OpenStack services')
 
 database_group = cfg.OptGroup(name='database',
                               title='Database Service Options')
diff --git a/trove/tests/tempest/plugin.py b/trove/tests/tempest/plugin.py
index 29f5a8511d..7909590db1 100644
--- a/trove/tests/tempest/plugin.py
+++ b/trove/tests/tempest/plugin.py
@@ -15,6 +15,7 @@
 
 import os
 
+from tempest import config
 from tempest.test_discover import plugins
 
 from trove.tests.tempest import config as trove_config
@@ -31,11 +32,15 @@ class TroveTempestPlugin(plugins.TempestPlugin):
         return full_test_dir, base_path
 
     def register_opts(self, conf):
-        conf.register_group(trove_config.messaging_group)
-        conf.register_opts(trove_config.DatabaseGroup, group='database')
-        conf.register_opts(trove_config.service_option,
-                           group='service_available')
+        config.register_opt_group(
+            conf, trove_config.service_available_group,
+            trove_config.ServiceAvailableGroup
+        )
+        config.register_opt_group(
+            conf, trove_config.database_group,
+            trove_config.DatabaseGroup
+        )
 
     def get_opt_lists(self):
-        return [('database', trove_config.MessagingGroup),
-                ('service_available', [trove_config.service_option])]
+        return [('database', trove_config.DatabaseGroup),
+                ('service_available', trove_config.ServiceAvailableGroup)]
diff --git a/trove/tests/tempest/tests/api/flavors/__init__.py b/trove/tests/tempest/tests/api/database/__init__.py
similarity index 100%
rename from trove/tests/tempest/tests/api/flavors/__init__.py
rename to trove/tests/tempest/tests/api/database/__init__.py
diff --git a/trove/tests/tempest/tests/api/base.py b/trove/tests/tempest/tests/api/database/base.py
similarity index 100%
rename from trove/tests/tempest/tests/api/base.py
rename to trove/tests/tempest/tests/api/database/base.py
diff --git a/trove/tests/tempest/tests/api/limits/__init__.py b/trove/tests/tempest/tests/api/database/flavors/__init__.py
similarity index 100%
rename from trove/tests/tempest/tests/api/limits/__init__.py
rename to trove/tests/tempest/tests/api/database/flavors/__init__.py
diff --git a/trove/tests/tempest/tests/api/flavors/test_flavors.py b/trove/tests/tempest/tests/api/database/flavors/test_flavors.py
similarity index 82%
rename from trove/tests/tempest/tests/api/flavors/test_flavors.py
rename to trove/tests/tempest/tests/api/database/flavors/test_flavors.py
index d017a76a7f..0dc88291d3 100644
--- a/trove/tests/tempest/tests/api/flavors/test_flavors.py
+++ b/trove/tests/tempest/tests/api/database/flavors/test_flavors.py
@@ -17,7 +17,7 @@ from tempest.lib import decorators
 from tempest import test
 from testtools import testcase as testtools
 
-from trove.tests.tempest.tests.api import base
+from trove.tests.tempest.tests.api.database import base
 
 
 class DatabaseFlavorsTest(base.BaseDatabaseTest):
@@ -71,6 +71,17 @@ class DatabaseFlavorsTest(base.BaseDatabaseTest):
         for os_flavor in os_flavors:
             db_flavor =\
                 self.client.show_db_flavor(os_flavor['id'])['flavor']
-            self._check_values(['id', 'name', 'ram'], db_flavor, os_flavor)
+            if db_flavor['id']:
+                self.assertIn('id', db_flavor)
+                self.assertEqual(str(db_flavor['id']), str(os_flavor['id']),
+                                 "DB flavor id differs from OS flavor id value"
+                                 )
+            else:
+                self.assertIn('str_id', db_flavor)
+                self.assertEqual(db_flavor['str_id'], str(os_flavor['id']),
+                                 "DB flavor id differs from OS flavor id value"
+                                 )
+
+            self._check_values(['name', 'ram'], db_flavor, os_flavor)
             self._check_values(['disk', 'vcpus', 'swap'], db_flavor, os_flavor,
                                in_db=False)
diff --git a/trove/tests/tempest/tests/api/flavors/test_flavors_negative.py b/trove/tests/tempest/tests/api/database/flavors/test_flavors_negative.py
similarity index 95%
rename from trove/tests/tempest/tests/api/flavors/test_flavors_negative.py
rename to trove/tests/tempest/tests/api/database/flavors/test_flavors_negative.py
index cc06ba38e5..ad20807141 100644
--- a/trove/tests/tempest/tests/api/flavors/test_flavors_negative.py
+++ b/trove/tests/tempest/tests/api/database/flavors/test_flavors_negative.py
@@ -18,7 +18,7 @@ from tempest.lib import decorators
 from tempest.lib import exceptions as lib_exc
 from testtools import testcase as testtools
 
-from trove.tests.tempest.tests.api import base
+from trove.tests.tempest.tests.api.database import base
 
 
 class DatabaseFlavorsNegativeTest(base.BaseDatabaseTest):
diff --git a/trove/tests/tempest/tests/api/versions/__init__.py b/trove/tests/tempest/tests/api/database/limits/__init__.py
similarity index 100%
rename from trove/tests/tempest/tests/api/versions/__init__.py
rename to trove/tests/tempest/tests/api/database/limits/__init__.py
diff --git a/trove/tests/tempest/tests/api/limits/test_limits.py b/trove/tests/tempest/tests/api/database/limits/test_limits.py
similarity index 97%
rename from trove/tests/tempest/tests/api/limits/test_limits.py
rename to trove/tests/tempest/tests/api/database/limits/test_limits.py
index 460d5bc826..c58ef6b8db 100644
--- a/trove/tests/tempest/tests/api/limits/test_limits.py
+++ b/trove/tests/tempest/tests/api/database/limits/test_limits.py
@@ -16,7 +16,7 @@
 from tempest.lib import decorators
 from testtools import testcase as testtools
 
-from trove.tests.tempest.tests.api import base
+from trove.tests.tempest.tests.api.database import base
 
 
 class DatabaseLimitsTest(base.BaseDatabaseTest):
diff --git a/trove/tests/tempest/tests/api/database/versions/__init__.py b/trove/tests/tempest/tests/api/database/versions/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/trove/tests/tempest/tests/api/versions/test_versions.py b/trove/tests/tempest/tests/api/database/versions/test_versions.py
similarity index 96%
rename from trove/tests/tempest/tests/api/versions/test_versions.py
rename to trove/tests/tempest/tests/api/database/versions/test_versions.py
index 9bb2d91269..53eb7c32db 100644
--- a/trove/tests/tempest/tests/api/versions/test_versions.py
+++ b/trove/tests/tempest/tests/api/database/versions/test_versions.py
@@ -16,7 +16,7 @@
 from tempest.lib import decorators
 from testtools import testcase as testtools
 
-from trove.tests.tempest.tests.api import base
+from trove.tests.tempest.tests.api.database import base
 
 
 class DatabaseVersionsTest(base.BaseDatabaseTest):