diff --git a/requirements.txt b/requirements-server.txt
similarity index 54%
copy from requirements.txt
copy to requirements-server.txt
index 8bf3155c..0fd17f45 100644
--- a/requirements.txt
+++ b/requirements-server.txt
@@ -1,5 +1,2 @@
-vcversioner
-click
 Django < 2.0
 djangorestframework
-xmltodict
diff --git a/requirements-swh.txt b/requirements-swh-server.txt
similarity index 83%
copy from requirements-swh.txt
copy to requirements-swh-server.txt
index ae6f63e2..1b77634b 100644
--- a/requirements-swh.txt
+++ b/requirements-swh-server.txt
@@ -1,5 +1,4 @@
-swh.core >= 0.0.36
 swh.loader.tar >= 0.0.39
 swh.loader.core >= 0.0.32
 swh.scheduler >= 0.0.39
 swh.model >= 0.0.26
diff --git a/requirements-swh.txt b/requirements-swh.txt
index ae6f63e2..5662ee37 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1 @@
 swh.core >= 0.0.36
-swh.loader.tar >= 0.0.39
-swh.loader.core >= 0.0.32
-swh.scheduler >= 0.0.39
-swh.model >= 0.0.26
diff --git a/requirements.txt b/requirements.txt
index 8bf3155c..55d56038 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,3 @@
 vcversioner
 click
-Django < 2.0
-djangorestframework
 xmltodict
diff --git a/setup.py b/setup.py
index 5a775df7..2b1163be 100755
--- a/setup.py
+++ b/setup.py
@@ -1,69 +1,71 @@
 #!/usr/bin/env python3
 # Copyright (C) 2015-2018  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from setuptools import setup, find_packages
 
 from os import path
 from io import open
 
 here = path.abspath(path.dirname(__file__))
 
 # Get the long description from the README file
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 
 def parse_requirements(name=None):
     if name:
         reqf = 'requirements-%s.txt' % name
     else:
         reqf = 'requirements.txt'
 
     requirements = []
     if not path.exists(reqf):
         return requirements
 
     with open(reqf) as f:
         for line in f.readlines():
             line = line.strip()
             if not line or line.startswith('#'):
                 continue
             requirements.append(line)
     return requirements
 
 
 setup(
     name='swh.deposit',
     description='Software Heritage Deposit Server',
     long_description=long_description,
     long_description_content_type='text/markdown',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/source/swh-deposit/',
     packages=find_packages(),
     install_requires=parse_requirements() + parse_requirements('swh'),
     tests_require=parse_requirements('test'),
     setup_requires=['vcversioner'],
-    extras_require={'testing': parse_requirements('test')},
+    extras_require={'testing': parse_requirements('test'),
+                    'server': (parse_requirements('server') +
+                               parse_requirements('swh-server'))},
     vcversioner={},
     include_package_data=True,
     entry_points='''
         [console_scripts]
         swh-deposit=swh.deposit.cli:main
     ''',
     classifiers=[
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
         "Operating System :: OS Independent",
         "Development Status :: 5 - Production/Stable",
     ],
     project_urls={
         'Bug Reports': 'https://forge.softwareheritage.org/maniphest',
         'Funding': 'https://www.softwareheritage.org/donate',
         'Source': 'https://forge.softwareheritage.org/source/swh-deposit',
     },
 )
diff --git a/tox.ini b/tox.ini
index b6cc2998..4b16a55a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,20 @@
 [tox]
 envlist=flake8,py3
 
 [testenv:py3]
 deps =
   .[testing]
+  .[server]
   pytest-cov
   pifpaf
   pytest-django
 commands =
   pifpaf run postgresql -- pytest --cov {envsitepackagesdir}/swh/deposit --cov-branch {posargs} {envsitepackagesdir}/swh/deposit
 
 [testenv:flake8]
 skip_install = true
 deps =
   flake8
 commands =
   {envpython} -m flake8 \
     --exclude=.tox,.git,__pycache__,.tox,.eggs,*.egg,swh/deposit/migrations