diff --git a/.jshintrc b/.jshintrc
index 4aedb3cf..f03eef65 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -87,6 +87,8 @@
         "describe": true,
         "before": true,
         "after": true,
+        "beforeEach": true,
+        "afterEach": true,
         "it": true,
         "suite": true,
         "suiteSetup": true,
diff --git a/test/acceptance/limits.js b/test/acceptance/limits.js
new file mode 100644
index 00000000..be6c46ee
--- /dev/null
+++ b/test/acceptance/limits.js
@@ -0,0 +1,150 @@
+require('../support/test_helper');
+
+var assert = require('../support/assert');
+var _ = require('underscore');
+var redis = require('redis');
+
+var CartodbWindshaft = require('../../lib/cartodb/cartodb_windshaft');
+var serverOptions = require('../../lib/cartodb/server_options')();
+var server = new CartodbWindshaft(serverOptions);
+server.setMaxListeners(0);
+
+describe('render limits', function() {
+
+    var layergroupUrl = '/api/v1/map';
+
+    var redisClient = redis.createClient(global.environment.redis.port);
+    after(function(done) {
+        redisClient.keys("map_style|*", function(err, matches) {
+            redisClient.del(matches, function() {
+                done();
+            });
+        });
+    });
+
+    var keysToDelete = [];
+    afterEach(function(done) {
+        redisClient.DEL(keysToDelete, function() {
+            keysToDelete = [];
+            done();
+        });
+    });
+
+    var user = 'localhost';
+
+    var pointSleepSql = "SELECT pg_sleep(1)," +
+        " 'SRID=3857;POINT(0 0)'::geometry the_geom_webmercator, 1 cartodb_id";
+    var pointCartoCss = '#layer { marker-fill:red; }';
+    var polygonSleepSql = "SELECT pg_sleep(1)," +
+        " ST_Buffer('SRID=3857;POINT(0 0)'::geometry, 100000000) the_geom_webmercator, 1 cartodb_id";
+    var polygonCartoCss = '#layer { polygon-fill:red; }';
+
+    function singleLayergroupConfig(sql, cartocss) {
+        return {
+            version: '1.0.0',
+            layers: [
+                {
+                    type: 'mapnik',
+                    options: {
+                        sql: sql,
+                        cartocss: cartocss,
+                        cartocss_version: '2.0.1'
+                    }
+                }
+            ]
+        };
+    }
+
+    function createRequest(layergroup, userHost) {
+        return {
+            url: layergroupUrl,
+            method: 'POST',
+            headers: {
+                host: userHost,
+                'Content-Type': 'application/json'
+            },
+            data: JSON.stringify(layergroup)
+        };
+    }
+
+    function withRenderLimit(user, renderLimit, callback) {
+        redisClient.SELECT(5, function(err) {
+            if (err) {
+                return callback(err);
+            }
+            var userLimitsKey = 'limits:tiler:' + user;
+            redisClient.HSET(userLimitsKey, 'render', renderLimit, function(err) {
+                if (err) {
+                    return callback(err);
+                }
+                keysToDelete.push(userLimitsKey);
+                return callback();
+            });
+        });
+
+    }
+
+    it("layergroup creation fails if test tile is slow", function(done) {
+        withRenderLimit(user, 50, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var layergroup = singleLayergroupConfig(polygonSleepSql, polygonCartoCss);
+            assert.response(server,
+                createRequest(layergroup, user),
+                {
+                    status: 400
+                },
+                function(res) {
+                    var parsed = JSON.parse(res.body);
+                    assert.deepEqual(parsed, { errors: [ 'Render timed out' ] });
+                    done();
+                }
+            );
+        });
+    });
+
+    it("layergroup creation works if test tile is fast but tile request fails if they are slow",  function(done) {
+        withRenderLimit(user, 50, function(err) {
+            if (err) {
+                return done(err);
+            }
+
+            var layergroup = singleLayergroupConfig(pointSleepSql, pointCartoCss);
+            assert.response(server,
+                createRequest(layergroup, user),
+                {
+                    status: 200
+                },
+                function(res) {
+                    assert.response(server,
+                        {
+                            url: layergroupUrl + _.template('/<%= layergroupId %>/<%= z %>/<%= x %>/<%= y %>.png', {
+                                layergroupId: JSON.parse(res.body).layergroupid,
+                                z: 0,
+                                x: 0,
+                                y: 0
+                            }),
+                            method: 'GET',
+                            headers: {
+                                host: 'localhost'
+                            },
+                            encoding: 'binary'
+                        },
+                        {
+                            status: 400
+                        },
+                        function(res) {
+                            var parsed = JSON.parse(res.body);
+                            assert.deepEqual(parsed, { error: 'Render timed out' });
+                            done();
+                        }
+                    );
+
+                }
+            );
+        });
+    });
+
+});