diff --git a/test/adapters/mysql2_test.js b/test/adapters/mysql2_test.js
index 1829acf..aee01eb 100644
--- a/test/adapters/mysql2_test.js
+++ b/test/adapters/mysql2_test.js
@@ -17,8 +17,6 @@ let nodeQuery = reload('../../lib/NodeQuery')(config);
 let qb = nodeQuery.getQuery();
 
 suite('Mysql2 adapter tests -', () => {
-	suiteSetup(done => qb.truncate('create_test').then(() => done()));
-
 	test('nodeQuery.getQuery = nodeQuery.init', () => {
 		expect(nodeQuery.getQuery())
 			.to.be.deep.equal(qb);
diff --git a/test/adapters/pg_test.js b/test/adapters/pg_test.js
index e732091..c701685 100644
--- a/test/adapters/pg_test.js
+++ b/test/adapters/pg_test.js
@@ -19,14 +19,6 @@ let qb = nodeQuery.getQuery();
 let qb2 = null;
 
 suite('Pg adapter tests -', () => {
-	suiteSetup(done => {
-		qb.truncate('create_join').then(() => {
-			qb.truncate('create_test').then(() => {
-				done();
-			});
-		});
-	});
-
 	test('nodeQuery.getQuery = nodeQuery.init', () => {
 		expect(nodeQuery.getQuery())
 			.to.be.deep.equal(qb);
diff --git a/test/sql/mysql.sql b/test/sql/mysql.sql
index d856f1b..5b06c28 100644
--- a/test/sql/mysql.sql
+++ b/test/sql/mysql.sql
@@ -1,11 +1,10 @@
 -- sample data to test MySQL
 
-
 --
 -- Table structure for table `create_join`
 --
 
-DROP TABLE IF EXISTS `create_join`;
+DROP TABLE IF EXISTS `create_join` CASCADE;
 CREATE TABLE `create_join` (
   `id` int(10) NOT NULL,
   `key` text,
@@ -18,7 +17,7 @@ ALTER TABLE `create_join`
 -- Table structure for table `create_test`
 --
 
-DROP TABLE IF EXISTS `create_test`;
+DROP TABLE IF EXISTS `create_test` CASCADE;
 CREATE TABLE `create_test` (
   `id` int(10) NOT NULL,
   `key` text,
diff --git a/test/sql/pgsql.sql b/test/sql/pgsql.sql
index ab30e87..09ad873 100644
--- a/test/sql/pgsql.sql
+++ b/test/sql/pgsql.sql
@@ -1,13 +1,15 @@
 -- sample data to test PostgreSQL INFORMATION_SCHEMA
+DROP TABLE IF EXISTS "create_join" CASCADE;
+DROP TABLE IF EXISTS "create_test" CASCADE;
 
 -- Table create_join
-CREATE TABLE create_join (
+CREATE TABLE "create_join" (
     id integer NOT NULL,
     key text,
     val text
 );
 
-CREATE TABLE create_test (
+CREATE TABLE "create_test" (
     id integer NOT NULL,
     key text,
     val text