diff --git a/requirements-test.txt b/requirements-test.txt
index 966983a9..b475770b 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,19 +1,29 @@
 decorator  # dependency of swh.core[http]
 djangorestframework-stubs
 django-stubs
 django-test-migrations
 hypothesis
 pytest < 7.0.0  # v7.0.0 removed _pytest.tmpdir.TempdirFactory, which is used by some of the pytest plugins we use
 pytest-django
 pytest-mock
 pytest-postgresql
 requests-mock != 1.9.0, != 1.9.1
 swh.core[http] >= 0.0.95
 swh.loader.git >= 0.8.0
 swh-scheduler[testing] >= 0.5.0
 swh.storage >= 0.1.1
 types-chardet
 types-docutils
 types-psycopg2
 types-pyyaml
 types-requests
+
+# TODO: remove dependencies below once pybadges depends on Jinja2 >=3
+
+# Fix "ImportError: cannot import name 'soft_unicode' from 'markupsafe'"
+# when running pytest
+markupsafe < 2.1.0
+# Fix "ImportError: cannot import name 'json' from 'itsdangerous'"
+# when running pytest after calling "./bin/install" from swh-environement
+# in empty venv
+flask >= 1.1.4
diff --git a/requirements.txt b/requirements.txt
index 08c82a90..7bb1e6e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,36 +1,26 @@
 # Add here external Python modules dependencies, one per line. Module names
 # should match https://pypi.python.org/pypi names. For the full spec or
 # dependency lines, see https://pip.readthedocs.org/en/1.1/requirements.html
 
 beautifulsoup4
 chardet
 cryptography
 django < 3
 django-cors-headers
 django-js-reverse
 djangorestframework
 django-webpack-loader
 docutils
 htmlmin
 iso8601
 lxml
 prometheus-client
 pybadges >= 2.2.1
 pygments
 python-magic >= 0.4.0
 python-memcached
 pyyaml
 requests
 sentry-sdk
 typing-extensions
 psycopg2 < 2.9
-
-# TODO: remove dependencies below once pybadges depends on Jinja2 >=3
-
-# Fix "ImportError: cannot import name 'soft_unicode' from 'markupsafe'"
-# when running pytest
-markupsafe < 2.1.0
-# Fix "ImportError: cannot import name 'json' from 'itsdangerous'"
-# when running pytest after calling "./bin/install" from swh-environement
-# in empty venv
-flask >= 1.1.4