diff --git a/var/spack/repos/builtin/packages/py-cffi/package.py b/var/spack/repos/builtin/packages/py-cffi/package.py
index 2010aa1431c7d21261b3545e7cecb3e085309916..e61aa14c677bc57ffbab0ad68c267605f4a8a29b 100644
--- a/var/spack/repos/builtin/packages/py-cffi/package.py
+++ b/var/spack/repos/builtin/packages/py-cffi/package.py
@@ -9,11 +9,13 @@
 
 class PyCffi(PythonPackage):
     """Foreign Function Interface for Python calling C code"""
-    homepage = "http://cffi.readthedocs.org/en/latest/"
-    url      = "https://pypi.io/packages/source/c/cffi/cffi-1.10.0.tar.gz"
+
+    homepage = "https://cffi.readthedocs.io/en/latest/"
+    url      = "https://pypi.io/packages/source/c/cffi/cffi-1.13.0.tar.gz"
 
     import_modules = ['cffi']
 
+    version('1.13.0', sha256='8fe230f612c18af1df6f348d02d682fe2c28ca0a6c3856c99599cdacae7cf226')
     version('1.12.2', sha256='e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7')
     version('1.11.5', sha256='e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4')
     version('1.10.0', sha256='b3b02911eb1f6ada203b0763ba924234629b51586f72a21faacc638269f4ced5')
@@ -22,14 +24,17 @@ class PyCffi(PythonPackage):
     depends_on('pkgconfig', type='build')
     depends_on('py-setuptools', type='build')
     depends_on('py-pycparser', type=('build', 'run'))
+    depends_on('py-pycparser@2.19:', when='^python@:2.6', type=('build', 'run'))
     depends_on('libffi')
+    depends_on('py-py', type='test')
+    depends_on('py-pytest', type='test')
 
-    def setup_environment(self, spack_env, run_env):
+    def setup_build_environment(self, env):
         # This sets the compiler (and flags) that distutils will use
         # to create the final shared library.  It will use the
         # compiler specified by the environment variable 'CC' for all
-        # other compilation.  We are setting the 'LDSHARED" to the
+        # other compilation.  We are setting 'LDSHARED' to the
         # spack compiler wrapper plus a few extra flags necessary for
         # building the shared library.
         if not sys.platform == 'darwin':
-            spack_env.set('LDSHARED', "{0} -shared -pthread".format(spack_cc))
+            env.set('LDSHARED', '{0} -shared -pthread'.format(spack_cc))