diff --git a/test/acceptance/overviews.js b/test/acceptance/overviews.js
index 12b23fe0..10e567f5 100644
--- a/test/acceptance/overviews.js
+++ b/test/acceptance/overviews.js
@@ -95,11 +95,11 @@ describe('overviews', function() {
               assert.ok(mapConfig._cfg.layers[0].options.overviews.test_table_overviews[2]);
               assert.equal(
                   mapConfig._cfg.layers[0].options.overviews.test_table_overviews[1].table,
-                  'test_table_overviews_ov1'
+                  '_vovw_1_test_table_overviews'
               );
               assert.equal(
                   mapConfig._cfg.layers[0].options.overviews.test_table_overviews[2].table,
-                  'test_table_overviews_ov2'
+                  '_vovw_2_test_table_overviews'
               );
             });
 
diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js
index b7d95cfc..5ee879c2 100644
--- a/test/integration/mapconfig_overviews_adapter.js
+++ b/test/integration/mapconfig_overviews_adapter.js
@@ -80,11 +80,11 @@ describe('MapConfigOverviewsAdapter', function() {
             assert.ok(layers[0].options.overviews.test_table_overviews[2]);
             assert.equal(
                 layers[0].options.overviews.test_table_overviews[1].table,
-                'test_table_overviews_ov1'
+                '_vovw_1_test_table_overviews'
               );
             assert.equal(
                 layers[0].options.overviews.test_table_overviews[2].table,
-                'test_table_overviews_ov2'
+                '_vovw_2_test_table_overviews'
               );
             done();
         });
diff --git a/test/integration/overviews-api.js b/test/integration/overviews-api.js
index 0d28f050..ff256821 100644
--- a/test/integration/overviews-api.js
+++ b/test/integration/overviews-api.js
@@ -42,8 +42,8 @@ describe('OverviewsApi', function() {
 
             assert.deepEqual(result, {
                 'test_table_overviews': {
-                  1: { table: 'test_table_overviews_ov1' },
-                  2: { table: 'test_table_overviews_ov2' }
+                  1: { table: '_vovw_1_test_table_overviews' },
+                  2: { table: '_vovw_2_test_table_overviews' }
                 }
             });
 
diff --git a/test/support/sql/CDB_Overviews.sql b/test/support/sql/CDB_Overviews.sql
index 0acb16b9..b081ae57 100644
--- a/test/support/sql/CDB_Overviews.sql
+++ b/test/support/sql/CDB_Overviews.sql
@@ -5,9 +5,9 @@ AS $$
   BEGIN
     IF (SELECT 'test_table_overviews'::regclass = ANY (table_names)) THEN
       RETURN QUERY
-        SELECT 'test_table_overviews'::regclass AS base_table, 1 AS z, 'test_table_overviews_ov1'::regclass AS overviw_table
+        SELECT 'test_table_overviews'::regclass AS base_table, 1 AS z, '_vovw_1_test_table_overviews'::regclass AS overview_table
         UNION ALL
-        SELECT 'test_table_overviews'::regclass AS base_table, 2 AS z, 'test_table_overviews_ov2'::regclass AS overviw_table;
+        SELECT 'test_table_overviews'::regclass AS base_table, 2 AS z, '_vovw_2_test_table_overviews'::regclass AS overview_table;
     ELSE
       RETURN;
     END IF;
diff --git a/test/support/sql/windshaft.test.sql b/test/support/sql/windshaft.test.sql
index 3b795c01..85851300 100644
--- a/test/support/sql/windshaft.test.sql
+++ b/test/support/sql/windshaft.test.sql
@@ -285,7 +285,7 @@ CREATE INDEX test_table_overviews_the_geom_webmercator_idx ON test_table_overvie
 GRANT ALL ON TABLE test_table_overviews TO :TESTUSER;
 GRANT SELECT ON TABLE test_table_overviews TO :PUBLICUSER;
 
-CREATE TABLE test_table_overviews_ov1 (
+CREATE TABLE _vovw_1_test_table_overviews (
     updated_at timestamp without time zone DEFAULT now(),
     created_at timestamp without time zone DEFAULT now(),
     cartodb_id integer NOT NULL,
@@ -301,7 +301,7 @@ CREATE TABLE test_table_overviews_ov1 (
     CONSTRAINT enforce_srid_the_geom_webmercator CHECK ((st_srid(the_geom_webmercator) = 3857))
 );
 
-CREATE TABLE test_table_overviews_ov2 (
+CREATE TABLE _vovw_2_test_table_overviews (
     updated_at timestamp without time zone DEFAULT now(),
     created_at timestamp without time zone DEFAULT now(),
     cartodb_id integer NOT NULL,