diff --git a/test/acceptance/multilayer-server-test.js b/test/acceptance/multilayer-server-test.js
index cb26c8f6..2b5558c6 100644
--- a/test/acceptance/multilayer-server-test.js
+++ b/test/acceptance/multilayer-server-test.js
@@ -368,8 +368,8 @@ describe('tests from old api translated to multilayer', function() {
                 keysToDelete['user:localhost:mapviews:global'] = 5;
 
                 var affectedFn = QueryTables.getQueryMetadataModel;
-                QueryTables.getQueryMetadataModel = async function (pg, sql) {
-                    throw new Error('fake error message');
+                QueryTables.getQueryMetadataModel = function () {
+                    return Promise.reject(new Error('fake error message'));
                 };
 
                 // reset internal cacheChannel cache
diff --git a/test/integration/query-tables-test.js b/test/integration/query-tables-test.js
index 04206b58..dcc3aad8 100644
--- a/test/integration/query-tables-test.js
+++ b/test/integration/query-tables-test.js
@@ -32,27 +32,30 @@ describe('QueryTables', function() {
 
     // Check test/support/sql/windshaft.test.sql to understand where the values come from.
 
-    it('should return an object with affected tables array and last updated time', async function () {
+    it('should return an object with affected tables array and last updated time', function () {
         var query = 'select * from test_table';
-        const result = await QueryTables.getQueryMetadataModel(connection, query);
+        return QueryTables.getQueryMetadataModel(connection, query)
+            .then(result => {
+                assert.equal(result.getLastUpdatedAt(), 1234567890123);
 
-        assert.equal(result.getLastUpdatedAt(), 1234567890123);
+                assert.equal(result.tables.length, 1);
+                assert.equal(result.tables[0].dbname, 'test_windshaft_cartodb_user_1_db');
+                assert.equal(result.tables[0].schema_name, 'public');
+                assert.equal(result.tables[0].table_name, 'test_table');
+            });
 
-        assert.equal(result.tables.length, 1);
-        assert.equal(result.tables[0].dbname, 'test_windshaft_cartodb_user_1_db');
-        assert.equal(result.tables[0].schema_name, 'public');
-        assert.equal(result.tables[0].table_name, 'test_table');
     });
 
-    it('should work with private tables', async function () {
+    it('should work with private tables', function () {
         var query = 'select * from test_table_private_1';
-        const result = await  QueryTables.getQueryMetadataModel(connection, query);
+        return QueryTables.getQueryMetadataModel(connection, query)
+            .then(result => {
+                assert.equal(result.getLastUpdatedAt(), 1234567890123);
 
-        assert.equal(result.getLastUpdatedAt(), 1234567890123);
-
-        assert.equal(result.tables.length, 1);
-        assert.equal(result.tables[0].dbname, 'test_windshaft_cartodb_user_1_db');
-        assert.equal(result.tables[0].schema_name, 'public');
-        assert.equal(result.tables[0].table_name, 'test_table_private_1');
+                assert.equal(result.tables.length, 1);
+                assert.equal(result.tables[0].dbname, 'test_windshaft_cartodb_user_1_db');
+                assert.equal(result.tables[0].schema_name, 'public');
+                assert.equal(result.tables[0].table_name, 'test_table_private_1');
+            });
     });
 });