diff --git a/run_tests.py b/run_tests.py
index fc306f419f..542144bf7e 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -24,6 +24,7 @@ import sys
 import traceback
 
 from trove.common import cfg
+from trove.common import utils
 from trove.openstack.common import log as logging
 from trove.tests.config import CONFIG
 from wsgi_intercept.httplib2_intercept import install as wsgi_install
@@ -82,8 +83,8 @@ def datastore_init():
                               default_version_id=
                               CONFIG.dbaas_datastore_version_id)
 
-    models.DBDatastore.create(id=CONFIG.dbaas_datastore_id_no_versions,
-                              name='Test_Datastore_1',
+    models.DBDatastore.create(id=utils.generate_uuid(),
+                              name=CONFIG.dbaas_datastore_name_no_versions,
                               default_version_id=None)
 
     main_dsv = models.DBDatastoreVersion.create(
diff --git a/trove/db/sqlalchemy/migrate_repo/versions/019_datastore_fix.py b/trove/db/sqlalchemy/migrate_repo/versions/019_datastore_fix.py
index 964cde5f1d..dcf03d4595 100644
--- a/trove/db/sqlalchemy/migrate_repo/versions/019_datastore_fix.py
+++ b/trove/db/sqlalchemy/migrate_repo/versions/019_datastore_fix.py
@@ -89,7 +89,7 @@ def upgrade(migrate_engine):
 
     instance_table = Table('instances', meta, autoload=True)
 
-    if has_instances_wo_datastore_version:
+    if has_instances_wo_datastore_version(instance_table):
         instances = find_all_instances_wo_datastore_version(instance_table)
         image_id = find_image("mysql")
 
diff --git a/trove/tests/api/datastores.py b/trove/tests/api/datastores.py
index 7b119738a6..8b261e74af 100644
--- a/trove/tests/api/datastores.py
+++ b/trove/tests/api/datastores.py
@@ -88,16 +88,16 @@ class Datastores(object):
     @test
     def test_datastore_with_no_active_versions_is_hidden(self):
         datastores = self.rd_client.datastores.list()
-        id_list = [datastore.id for datastore in datastores]
-        id_no_versions = test_config.dbaas_datastore_id_no_versions
-        assert_true(id_no_versions not in id_list)
+        name_list = [datastore.name for datastore in datastores]
+        name_no_versions = test_config.dbaas_datastore_name_no_versions
+        assert_true(name_no_versions not in name_list)
 
     @test
     def test_datastore_with_no_active_versions_is_visible_for_admin(self):
         datastores = self.rd_admin.datastores.list()
-        id_list = [datastore.id for datastore in datastores]
-        id_no_versions = test_config.dbaas_datastore_id_no_versions
-        assert_true(id_no_versions in id_list)
+        name_list = [datastore.name for datastore in datastores]
+        name_no_versions = test_config.dbaas_datastore_name_no_versions
+        assert_true(name_no_versions in name_list)
 
 
 @test(groups=[tests.DBAAS_API, GROUP, tests.PRE_INSTANCES],
diff --git a/trove/tests/config.py b/trove/tests/config.py
index 2dffd7e957..209836d632 100644
--- a/trove/tests/config.py
+++ b/trove/tests/config.py
@@ -72,8 +72,7 @@ class TestConfig(object):
             'nova_url': "http://localhost:8774/v1.1",
             'dbaas_datastore': "mysql",
             'dbaas_datastore_id': "a00000a0-00a0-0a00-00a0-000a000000aa",
-            'dbaas_datastore_id_no_versions': "10000000-0000-0000-0000-"
-                                              "000000000001",
+            'dbaas_datastore_name_no_versions': "Test_Datastore_1",
             'dbaas_datastore_version': "5.5",
             'dbaas_datastore_version_id': "b00000b0-00b0-0b00-00b0-"
                                           "000b000000bb",