diff --git a/client/requirements.txt b/client/requirements.txt
index 613dd3aca1..f2293605cf 100644
--- a/client/requirements.txt
+++ b/client/requirements.txt
@@ -1,2 +1 @@
-pytest>=6.2.5
 requests
diff --git a/pytest.ini b/pytest.ini
index c01a1d0579..09e793a7df 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,9 +1,10 @@
 [pytest]
 addopts = -s
-log_cli=False
-log_level=INFO
+log_cli = False
+log_level = INFO
 filterwarnings=
   # Issue #557 in `pytest-cov` (currently v4.x) has not moved for a while now,
   # but once a resolution has been adopted we can drop this "ignore".
   # Ref: https://github.com/pytest-dev/pytest-cov/issues/557
   ignore:The --rsyncdir command line argument and rsyncdirs config variable are deprecated.:DeprecationWarning
+timeout = 300
diff --git a/server/test-requirements.txt b/server/test-requirements.txt
index 74b9b0569c..d4a824e080 100644
--- a/server/test-requirements.txt
+++ b/server/test-requirements.txt
@@ -1,13 +1,3 @@
-coverage
-filelock
-gitpython
-mock>=3.0.5
-pytest>=6.2.5
-pytest-cov>=2.7.1
-pytest-freezegun
-pytest-helpers-namespace==2019.1.8
-pytest-mock
 pytest-dependency  # functional tests
-pytest-xdist
+pytest-freezegun
 requests_mock
-responses
diff --git a/agent/test-requirements.txt b/test-requirements.txt
similarity index 90%
rename from agent/test-requirements.txt
rename to test-requirements.txt
index 792aa2d921..b19a6ef1b9 100644
--- a/agent/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,5 +6,6 @@ pytest>=6.2.5
 pytest-cov>=2.7.1
 pytest-helpers-namespace==2019.1.8
 pytest-mock
+pytest-timeout
 pytest-xdist
 responses
diff --git a/tox.ini b/tox.ini
index 577b7934f5..8934437ffc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,9 +28,9 @@ setenv =
     SKIP_WRITE_GIT_CHANGELOG = 1
 deps =
     -r{toxinidir}/agent/requirements.txt
-    -r{toxinidir}/agent/test-requirements.txt
     -r{toxinidir}/client/requirements.txt
     -r{toxinidir}/server/requirements.txt
+    -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/server/test-requirements.txt
 commands =
     bash -c "{toxinidir}/exec-tests {envdir} {posargs}"
@@ -43,7 +43,7 @@ basepython = python3.6
 deps =
     -c{toxinidir}/agent/test-constraints-3.6.txt
     -r{toxinidir}/agent/requirements.txt
-    -r{toxinidir}/agent/test-requirements.txt
+    -r{toxinidir}/test-requirements.txt
 
 [testenv:alembic-migration]
 description = Verify alembic migrations cover latest database schema