diff --git a/circleci/Dockerfile b/circleci/Dockerfile
index 347ef51..0f5d571 100644
--- a/circleci/Dockerfile
+++ b/circleci/Dockerfile
@@ -21,6 +21,7 @@ COPY fpm/php-fpm.conf /etc/php/php-fpm.conf
 # Configuration which can be overriden.
 # See /etc/php/php-fpm.conf
 ENV PHP_FPM_PORT=9002 \
+    PHP_FPM_LOG_LIMIT=32768 \
     PHP_FPM_MAX_CHILDREN=20 \
     PHP_FPM_START_SERVERS=2 \
     PHP_FPM_MIN_SPARE_SERVERS=2 \
diff --git a/circleci/fpm/php-fpm.conf b/circleci/fpm/php-fpm.conf
index 748fd55..7f05392 100644
--- a/circleci/fpm/php-fpm.conf
+++ b/circleci/fpm/php-fpm.conf
@@ -1,5 +1,6 @@
 [global]
 error_log = /proc/self/fd/2
+log_limit = ${PHP_FPM_LOG_LIMIT}
 
 [www]
 listen = [::]:${PHP_FPM_PORT}
diff --git a/fpm/goss.yml b/fpm/goss.yml
index d8d6863..90fb16d 100644
--- a/fpm/goss.yml
+++ b/fpm/goss.yml
@@ -1,11 +1,17 @@
 command:
   check-configuration:
-    exec: "mkdir /data/app && php-fpm --test"
+    exec: "mkdir -p /data/app && php-fpm --test"
     exit-status: 0
     stdout:
       not:
         contain-substring: "WARNING"
 
+  check-fpm-log-limit:
+    exec: "mkdir -p /data/app && php-fpm -tt 2>&1"
+    exit-status: 0
+    stdout:
+      contain-substring: "log_limit = 32768"
+
   check-php-compass-extension:
     exec: "php -m | grep -i compass"
     exit-status: 0