diff --git a/integration-tests/__tests__/alter-database.spec.js b/integration-tests/__tests__/alter-database.spec.js
index dae829f25..2863d9d97 100644
--- a/integration-tests/__tests__/alter-database.spec.js
+++ b/integration-tests/__tests__/alter-database.spec.js
@@ -3,7 +3,13 @@ const _ = require('lodash');
 const fp = require('lodash/fp');
 const { testWrapper } = require('../tools');
 const engines = require('../engines');
-const { getAlterDatabaseScript, extendDatabaseInfo, generateDbPairingId } = require('dbgate-tools');
+const {
+  getAlterDatabaseScript,
+  extendDatabaseInfo,
+  generateDbPairingId,
+  formatQueryWithoutParams,
+  runCommandOnDriver,
+} = require('dbgate-tools');
 
 const initSql = ['CREATE TABLE t1 (id int primary key)', 'CREATE TABLE t2 (id int primary key)'];
 
@@ -63,7 +69,7 @@ describe('Alter database', () => {
         db => {
           _.remove(db[type], x => x.pureName == 'obj1');
         },
-        object.create1
+        formatQueryWithoutParams(driver, object.create1)
       );
       expect(db[type].length).toEqual(0);
     })
@@ -74,7 +80,7 @@ describe('Alter database', () => {
     testWrapper(async (conn, driver, type, object, engine) => {
       for (const sql of initSql) await driver.query(conn, sql, { discardResult: true });
 
-      await driver.query(conn, object.create1, { discardResult: true });
+      await runCommandOnDriver(conn, driver, object.create1);
 
       const structure = extendDatabaseInfo(await driver.analyseFull(conn));
 
diff --git a/integration-tests/__tests__/object-analyse.spec.js b/integration-tests/__tests__/object-analyse.spec.js
index b96bb9da9..997d74034 100644
--- a/integration-tests/__tests__/object-analyse.spec.js
+++ b/integration-tests/__tests__/object-analyse.spec.js
@@ -99,10 +99,10 @@ describe('Object analyse', () => {
   test.each(flatSourceParameters())(
     'Test parameters simple analyse - %s - %s',
     testWrapper(async (conn, driver, testName, parameter, engine) => {
-      for (const sql of initSql) await driver.query(conn, sql, { discardResult: true });
-      for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true });
+      for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
+      for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
 
-      await driver.query(conn, parameter.create, { discardResult: true });
+      await runCommandOnDriver(conn, driver, parameter.create);
       const structure = await driver.analyseFull(conn);
 
       const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
@@ -117,15 +117,15 @@ describe('Object analyse', () => {
   test.each(flatSourceParameters())(
     'Test parameters create SQL - %s - %s',
     testWrapper(async (conn, driver, testName, parameter, engine) => {
-      for (const sql of initSql) await driver.query(conn, sql, { discardResult: true });
-      for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true });
+      for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
+      for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
 
-      await driver.query(conn, parameter.create, { discardResult: true });
+      await runCommandOnDriver(conn, driver, parameter.create);
       const structure1 = await driver.analyseFull(conn);
-      await driver.query(conn, parameter.drop, { discardResult: true });
+      await runCommandOnDriver(conn, driver, parameter.drop);
 
       const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1');
-      await driver.script(conn, obj.createSql);
+      await runCommandOnDriver(conn, driver, obj.createSql);
 
       const structure2 = await driver.analyseFull(conn);
       const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
diff --git a/integration-tests/engines.js b/integration-tests/engines.js
index 962590d5b..c2dd972f5 100644
--- a/integration-tests/engines.js
+++ b/integration-tests/engines.js
@@ -424,14 +424,14 @@ end;$$`,
 
 const filterLocal = [
   // filter local testing
-  '-MySQL',
+  'MySQL',
   '-MariaDB',
   '-PostgreSQL',
   '-SQL Server',
   '-SQLite',
   '-CockroachDB',
   '-ClickHouse',
-  'Oracle',
+  '-Oracle',
 ];
 
 const enginesPostgre = engines.filter(x => x.label == 'PostgreSQL');