diff --git a/test/acceptance/named_layers_visibility.js b/test/acceptance/named_layers_visibility.js
index 6a39402c..01e10126 100644
--- a/test/acceptance/named_layers_visibility.js
+++ b/test/acceptance/named_layers_visibility.js
@@ -22,21 +22,33 @@ describe('layers visibility for previews', function() {
     var username = 'localhost';
 
     function createLayer (color, layerId) {
+        var mod;
+
+        if (color === 'red') {
+            mod = 0;
+        } else if (color === 'orange') {
+            mod = 1;
+        } else if (color === 'blue') {
+            mod = 2;
+        } else {
+            mod = 0;
+        }
+
         return {
             type: 'mapnik',
             id: layerId,
             options: {
-                sql: 'select * from populated_places_simple_reduced where cartodb_id % 2 = 1',
+                sql: 'select * from populated_places_simple_reduced where cartodb_id % 3 = ' + mod,
                 cartocss: '#layer { marker-fill: ' + color + '; }',
                 cartocss_version: '2.3.0'
             }
         };
     }
 
-    function createTemplate(context) {
+    function createTemplate(scenario) {
         return {
             version: '0.0.1',
-            name: context.name,
+            name: scenario.name,
             auth: {
                 method: 'open'
             },
@@ -51,16 +63,15 @@ describe('layers visibility for previews', function() {
                 center: {
                     lng: 40,
                     lat: 20
-                }
+                },
+                preview_layers: scenario.layerPerview
             },
             layergroup: {
-                layers: context.layers
-            },
-            preview_layers: context.layerPerview
+                layers: scenario.layers
+            }
         };
     }
 
-
     afterEach(function (done) {
         test_helper.deleteRedisKeys({
             'user:localhost:mapviews:global': 5
@@ -101,6 +112,22 @@ describe('layers visibility for previews', function() {
             'layer2': true
         },
         layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_orange',
+        layerPerview: {
+            '0': true,
+            '1': true,
+            'layer2': false
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_blue',
+        layerPerview: {
+            '0': true,
+            '1': false,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
     }, {
         name: 'preview_layers_orange_blue',
         layerPerview: {
@@ -109,6 +136,22 @@ describe('layers visibility for previews', function() {
             'layer2': true
         },
         layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_red_orange_blue',
+        layerPerview: {
+            '0': true,
+            '1': true,
+            'layer2': true
+        },
+        layers: threeLayerPointDistintColor
+    }, {
+        name: 'preview_layers_all',
+        layerPerview: {},
+        layers: threeLayerPointDistintColor
+    },  {
+        name: 'preview_layers_undefined',
+        layerPerview: undefined,
+        layers: threeLayerPointDistintColor
     }];
 
     scenarios.forEach(function (scenario) {
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_all.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_all.png
new file mode 100644
index 00000000..2ea67e3c
Binary files /dev/null and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_all.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png
index 607d1e02..49fac7b9 100644
Binary files a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_blue.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png
index 96a43e8f..36bf8863 100644
Binary files a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png
index 96a43e8f..524a9cdb 100644
Binary files a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_orange_blue.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png
index cd95ba2b..800a8a5e 100644
Binary files a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_blue.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_blue.png
new file mode 100644
index 00000000..e81e1d76
Binary files /dev/null and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_blue.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange.png
new file mode 100644
index 00000000..7e8d9931
Binary files /dev/null and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange_blue.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange_blue.png
new file mode 100644
index 00000000..2ea67e3c
Binary files /dev/null and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_red_orange_blue.png differ
diff --git a/test/fixtures/previews/populated_places_simple_reduced-preview_layers_undefined.png b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_undefined.png
new file mode 100644
index 00000000..2ea67e3c
Binary files /dev/null and b/test/fixtures/previews/populated_places_simple_reduced-preview_layers_undefined.png differ