diff --git a/docs/conf.py b/docs/conf.py
index e650f2b..40a0b9a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -321,3 +321,6 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'https://docs.python.org/': None}
+
+# Autodoc configuraton.
+autoclass_content = 'both'
diff --git a/setup.cfg b/setup.cfg
index 5200090..2840644 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,9 @@
 # waive the privileges and immunities granted to it by virtue of its status
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
+[aliases]
+test=pytest
+
 [wheel]
 universal=1
 
diff --git a/setup.py b/setup.py
index 59867a6..f905aa7 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 history = open('CHANGES.rst').read()
 
 requirements = [
-    'Flask>=0.10.1',
+    'Flask>=0.11.1',
     'six>=1.7.2',
     'workflow>=1.2.0,<2.0.0',
     'invenio-base>=0.3.0',
@@ -54,37 +54,9 @@
     'invenio-testing>=0.1.0',
 ]
 
-
-class PyTest(TestCommand):
-
-    """PyTest Test."""
-
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        """Init pytest."""
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-        try:
-            from ConfigParser import ConfigParser
-        except ImportError:
-            from configparser import ConfigParser
-        config = ConfigParser()
-        config.read('pytest.ini')
-        self.pytest_args = config.get('pytest', 'addopts').split(' ')
-
-    def finalize_options(self):
-        """Finalize pytest."""
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        """Run tests."""
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
+setup_requires = [
+    'pytest-runner>=2.6.2',
+]
 
 # Get the version string. Cannot be done with import!
 g = {}
@@ -127,11 +99,11 @@ def run_tests(self):
         'Programming Language :: Python :: 2',
         # 'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         # 'Programming Language :: Python :: 3',
-        # 'Programming Language :: Python :: 3.3',
-        # 'Programming Language :: Python :: 3.4',
         'Development Status :: 1 - Planning',
     ],
     tests_require=test_requirements,
-    cmdclass={'test': PyTest},
 )