diff --git a/integration-tests/__tests__/schema-tests.spec.js b/integration-tests/__tests__/schema-tests.spec.js
index 44870cc43..116b15b17 100644
--- a/integration-tests/__tests__/schema-tests.spec.js
+++ b/integration-tests/__tests__/schema-tests.spec.js
@@ -55,25 +55,25 @@ describe('Schema tests', () => {
     })
   );
 
-//   test.each(engines.filter(x => x.supportSchemas && !x.skipSeparateSchemas).map(engine => [engine.label, engine]))(
-//     'Table inside schema - %s',
-//     testWrapper(async (handle, driver, engine) => {
-//       await baseStructure(handle, driver);
-//       await runCommandOnDriver(handle, driver, dmp => dmp.createSchema('myschema'));
+  test.each(engines.filter(x => x.supportSchemas && !x.skipSeparateSchemas).map(engine => [engine.label, engine]))(
+    'Table inside schema - %s',
+    testWrapper(async (handle, driver, engine) => {
+      await baseStructure(handle, driver);
+      await runCommandOnDriver(handle, driver, dmp => dmp.createSchema('myschema'));
 
-//       const schemaConnDef = {
-//         ...extractConnection(engine),
-//         database: `${handle.database}::myschema`,
-//       };
+      const schemaConnDef = {
+        ...extractConnection(engine),
+        database: `${handle.database}::myschema`,
+      };
 
-//       const schemaConn = await driver.connect(schemaConnDef);
-//       await driver.query(schemaConn, `create table myschema.myt1 (id int not null primary key)`);
-//       const structure1 = await driver.analyseFull(schemaConn);
-//       expect(structure1.tables.length).toEqual(1);
-//       expect(structure1.tables[0].pureName).toEqual('myt1');
-//     })
-//   );
-// });
+      const schemaConn = await driver.connect(schemaConnDef);
+      await driver.query(schemaConn, `create table myschema.myt1 (id int not null primary key)`);
+      const structure1 = await driver.analyseFull(schemaConn);
+      expect(structure1.tables.length).toEqual(1);
+      expect(structure1.tables[0].pureName).toEqual('myt1');
+    })
+  );
+});
 
 describe('Base analyser test', () => {
   test.each(engines.map(engine => [engine.label, engine]))(
diff --git a/packages/tools/src/schemaInfoTools.ts b/packages/tools/src/schemaInfoTools.ts
index 941410b8e..75711f2d9 100644
--- a/packages/tools/src/schemaInfoTools.ts
+++ b/packages/tools/src/schemaInfoTools.ts
@@ -24,6 +24,7 @@ export function isCompositeDbName(name: string) {
 }
 
 export function splitCompositeDbName(name: string) {
+  if (!isCompositeDbName(name)) return null;
   const [database, schema] = name.split('::');
   return { database, schema };
 }