diff --git a/internal/app/xhttp/handler_test.go b/internal/app/xhttp/handler_test.go
index 7e141d53..7cba003e 100644
--- a/internal/app/xhttp/handler_test.go
+++ b/internal/app/xhttp/handler_test.go
@@ -538,7 +538,8 @@ func TestOfficeHandler(t *testing.T) {
 	srv := New(config)
 	endpoint := officeEndpoint(config)
 	// should return 200.
-	body, contentType := test.OfficeMultipartForm(t, nil)
+	// note: increased the wait timeout as it happens to timeout from time to time.
+	body, contentType := test.OfficeMultipartForm(t, map[string]string{string(resource.WaitTimeoutArgKey): "30"})
 	req := httptest.NewRequest(http.MethodPost, endpoint, body)
 	req.Header.Set(echo.HeaderContentType, contentType)
 	test.AssertStatusCode(t, http.StatusOK, srv, req)
diff --git a/internal/pkg/chrome/chrome.go b/internal/pkg/chrome/chrome.go
index f70b2591..b4ba06f5 100644
--- a/internal/pkg/chrome/chrome.go
+++ b/internal/pkg/chrome/chrome.go
@@ -48,6 +48,8 @@ func cmd(logger xlog.Logger) (*exec.Cmd, error) {
 	args := []string{
 		"--no-sandbox",
 		"--headless",
+		// see https://github.com/thecodingmachine/gotenberg/issues/157.
+		"--disable-dev-shm-usage",
 		// see https://github.com/GoogleChrome/puppeteer/issues/2410.
 		"--font-render-hinting=medium",
 		"--remote-debugging-port=9222",