diff --git a/puppet/zulip/files/supervisor/conf.d/zulip.conf b/puppet/zulip/files/supervisor/conf.d/zulip.conf
index fa7cef26ed..82397f0d59 100644
--- a/puppet/zulip/files/supervisor/conf.d/zulip.conf
+++ b/puppet/zulip/files/supervisor/conf.d/zulip.conf
@@ -43,7 +43,7 @@ socket_owner=zulip:zulip
 socket_mode=0700
 
 [program:zulip-tornado]
-command=python -u /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9993
+command=env PYTHONUNBUFFERED=1 python /home/zulip/deployments/current/manage.py runtornado 127.0.0.1:9993
 priority=200                   ; the relative start priority (default 999)
 autostart=true                 ; start at supervisord start (default: true)
 autorestart=true               ; whether/when to restart (default: unexpected)
diff --git a/tools/run-dev.py b/tools/run-dev.py
index 782feaa5a1..44718e2cf1 100755
--- a/tools/run-dev.py
+++ b/tools/run-dev.py
@@ -125,7 +125,7 @@ os.setpgrp()
 cmds = [['./tools/compile-handlebars-templates', 'forever'],
         ['python', 'manage.py', 'rundjango'] +
         manage_args + ['127.0.0.1:%d' % (django_port,)],
-        ['python', '-u', 'manage.py', 'runtornado'] +
+        ['env', 'PYTHONUNBUFFERED=1', 'python', 'manage.py', 'runtornado'] +
         manage_args + ['127.0.0.1:%d' % (tornado_port,)],
         ['./tools/run-dev-queue-processors'] + manage_args,
         ['env', 'PGHOST=127.0.0.1',  # Force password authentication using .pgpass