diff --git a/python/setup.py b/python/setup.py
index 9d4c9e32c7..74e937e9cf 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,7 +17,7 @@
           'flask',
           'flask-cors',
           'redis',
-          'tornado',
+          'tornado>=4.3,<5',
           'requests',
           'numpy',
           'flatbuffers',
diff --git a/wrappers/s2i/python/Dockerfile.local.tmpl b/wrappers/s2i/python/Dockerfile.local.tmpl
index d7dba5df45..bf8edd10c2 100644
--- a/wrappers/s2i/python/Dockerfile.local.tmpl
+++ b/wrappers/s2i/python/Dockerfile.local.tmpl
@@ -11,7 +11,7 @@ WORKDIR /microservice
 COPY _python /microservice
 
 RUN cd /microservice/python && \
-    pip install .
+    make install
 
 COPY ./s2i/bin/ /s2i/bin