diff --git a/Dockerfile-dev b/Dockerfile-dev
index a6c8fc05..c9e60621 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -1,5 +1,5 @@
 ARG python_version=3.6
-FROM pypy:${python_version}
+FROM python:${python_version}
 LABEL maintainer "devs@bigchaindb.com"
 
 RUN apt-get update \
diff --git a/setup.py b/setup.py
index 0c954692..2c6930ba 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,6 @@ tests_require = [
 install_requires = [
     # TODO Consider not installing the db drivers, or putting them in extras.
     'pymongo~=3.6',
-    # 'pysha3~=1.0.2', # @PYPY: not compability with PyPy, replaced with native hashlib
     'cryptoconditions==0.8.0',
     'python-rapidjson~=0.6.0',
     'logstats~=0.2.1',
@@ -91,6 +90,9 @@ install_requires = [
     'packaging~=18.0',
 ]
 
+if sys.version_info < (3, 6):
+    install_requires.append('pysha3~=1.0.2')
+
 setup(
     name='BigchainDB',
     version=version['__version__'],