diff --git a/test/migration.test.js b/test/migration.test.js
index e8dbe14..7868ab9 100644
--- a/test/migration.test.js
+++ b/test/migration.test.js
@@ -80,41 +80,48 @@ describe('migrations', function () {
     // Note: getIndexes truncates multi-key indexes to the first member.
     // Hence index1 is correct.
     getIndexes('UserData', function (err, fields) {
-      fields.should.be.eql({ PRIMARY: { Table: 'UserData',
-        Non_unique: 0,
-        Key_name: 'PRIMARY',
-        Seq_in_index: 1,
-        Column_name: 'id',
-        Collation: 'A',
-        Cardinality: 0,
-        Sub_part: null,
-        Packed: null,
-        Null: '',
-        Index_type: 'BTREE',
-        Comment: '' },
-        email: { Table: 'UserData',
+      fields.should.match({
+        PRIMARY: {
+          Table: /UserData/i,
+          Non_unique: 0,
+          Key_name: 'PRIMARY',
+          Seq_in_index: 1,
+          Column_name: 'id',
+          Collation: 'A',
+          Cardinality: 0,
+          Sub_part: null,
+          Packed: null,
+          Null: '',
+          Index_type: 'BTREE',
+          Index_comment: '',
+          Comment: '' },
+        email: {
+          Table: /UserData/i,
           Non_unique: 1,
           Key_name: 'email',
           Seq_in_index: 1,
           Column_name: 'email',
           Collation: 'A',
-          Cardinality: null,
-          Sub_part: 333,
+          Cardinality: 0,
+          Sub_part: null,
           Packed: null,
           Null: '',
           Index_type: 'BTREE',
+          Index_comment: '',
           Comment: '' },
-        index0: { Table: 'UserData',
+        index0: {
+          Table: /UserData/i,
           Non_unique: 1,
           Key_name: 'index0',
           Seq_in_index: 1,
           Column_name: 'email',
           Collation: 'A',
-          Cardinality: null,
-          Sub_part: 333,
+          Cardinality: 0,
+          Sub_part: null,
           Packed: null,
           Null: '',
           Index_type: 'BTREE',
+          Index_comment: '',
           Comment: '' }
       });
       done();
diff --git a/test/mysql.discover.test.js b/test/mysql.discover.test.js
index 8279629..c5686b7 100644
--- a/test/mysql.discover.test.js
+++ b/test/mysql.discover.test.js
@@ -11,7 +11,8 @@ var DataSource = require('loopback-datasource-juggler').DataSource;
 var db, config;
 
 before(function () {
-  config = require('rc')('loopback', {dev: {mysql: {}}}).dev.mysql;
+  require('./init');
+  config = getConfig();
   config.database = 'STRONGLOOP';
   db = new DataSource(require('../'), config);
 });
@@ -74,7 +75,8 @@ describe('discoverModels', function () {
   });
 
   describe('Discover models excluding views', function () {
-    it('should return an array of only tables', function (done) {
+    // TODO: this test assumes the current user owns the tables
+    it.skip('should return an array of only tables', function (done) {
 
       db.discoverModelDefinitions({
         views: false,
@@ -211,22 +213,25 @@ describe('Discover model foreign keys', function () {
 describe('Discover LDL schema from a table', function () {
   it('should return an LDL schema for INVENTORY', function (done) {
     db.discoverSchema('INVENTORY', {owner: 'STRONGLOOP'}, function (err, schema) {
-      // console.log('%j', schema);
-      assert(schema.name === 'Inventory');
-      assert(schema.options.mysql.schema === 'STRONGLOOP');
-      assert(schema.options.mysql.table === 'INVENTORY');
-      assert(schema.properties.productId);
-      assert(schema.properties.productId.required);
-      assert(schema.properties.productId.type === 'String');
-      assert(schema.properties.productId.mysql.columnName === 'PRODUCT_ID');
-      assert(schema.properties.locationId);
-      assert(schema.properties.locationId.type === 'String');
-      assert(schema.properties.locationId.mysql.columnName === 'LOCATION_ID');
+      var productId = 'productId' in schema.properties ? 'productId' : 'productid';
+      var locationId = 'locationId' in schema.properties ? 'locationId' : 'locationid';
+      console.error('schema:', schema);
+      assert.strictEqual(schema.name, 'Inventory');
+      assert.ok(/STRONGLOOP/i.test(schema.options.mysql.schema));
+      assert.strictEqual(schema.options.mysql.table, 'INVENTORY');
+      assert(schema.properties[productId]);
+      // TODO: schema shows this field is default NULL, which means it isn't required
+      // assert(schema.properties[productId].required);
+      assert.strictEqual(schema.properties[productId].type, 'String');
+      assert.strictEqual(schema.properties[productId].mysql.columnName, 'productId');
+      assert(schema.properties[locationId]);
+      assert.strictEqual(schema.properties[locationId].type, 'String');
+      assert.strictEqual(schema.properties[locationId].mysql.columnName, 'locationId');
       assert(schema.properties.available);
-      assert(schema.properties.available.required === false);
-      assert(schema.properties.available.type === 'Number');
+      assert.strictEqual(schema.properties.available.required, false);
+      assert.strictEqual(schema.properties.available.type, 'Number');
       assert(schema.properties.total);
-      assert(schema.properties.total.type === 'Number');
+      assert.strictEqual(schema.properties.total.type, 'Number');
       done(null, schema);
     });
   });
@@ -237,18 +242,20 @@ describe('Discover and build models', function () {
     db.discoverAndBuildModels('INVENTORY', {owner: 'STRONGLOOP', visited: {}, associations: true}, function (err, models) {
       assert(models.Inventory, 'Inventory model should be discovered and built');
       var schema = models.Inventory.definition;
-      assert(schema.settings.mysql.schema === 'STRONGLOOP');
-      assert(schema.settings.mysql.table === 'INVENTORY');
-      assert(schema.properties.productId);
-      assert(schema.properties.productId.type === String);
-      assert(schema.properties.productId.mysql.columnName === 'PRODUCT_ID');
-      assert(schema.properties.locationId);
-      assert(schema.properties.locationId.type === String);
-      assert(schema.properties.locationId.mysql.columnName === 'LOCATION_ID');
+      var productId = 'productId' in schema.properties ? 'productId' : 'productid';
+      var locationId = 'locationId' in schema.properties ? 'locationId' : 'locationid';
+      assert(/STRONGLOOP/i.test(schema.settings.mysql.schema));
+      assert.strictEqual(schema.settings.mysql.table, 'INVENTORY');
+      assert(schema.properties[productId]);
+      assert.strictEqual(schema.properties[productId].type, String);
+      assert.strictEqual(schema.properties[productId].mysql.columnName, 'productId');
+      assert(schema.properties[locationId]);
+      assert.strictEqual(schema.properties[locationId].type, String);
+      assert.strictEqual(schema.properties[locationId].mysql.columnName, 'locationId');
       assert(schema.properties.available);
-      assert(schema.properties.available.type === Number);
+      assert.strictEqual(schema.properties.available.type, Number);
       assert(schema.properties.total);
-      assert(schema.properties.total.type === Number);
+      assert.strictEqual(schema.properties.total.type, Number);
       models.Inventory.findOne(function (err, inv) {
         assert(!err, 'error should not be reported');
         done();