diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c77e5cad..bb4d0e24 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.6', 'pypy-3.6-v7.3.3', '3.7', 'pypy-3.7', '3.8', 'pypy-3.8', '3.9']
+        python-version:
+        - '3.6'
+        - 'pypy-3.6-v7.3.3'
+        - '3.7'
+        - 'pypy-3.7'
+        - '3.8'
+        - 'pypy-3.8'
+        - '3.9'
+        - '3.10'
     name: Build with Python ${{ matrix.python-version }}
     steps:
       - name: Checkout
diff --git a/README.rst b/README.rst
index f867f834..40a22fe0 100644
--- a/README.rst
+++ b/README.rst
@@ -419,8 +419,8 @@ Run all tests using -
 
 The tox tests include code style checks via pep8 and pylint.
 
-The tox tests are configured to run on Python 2.7, 3.4, 3.5, 3.6, 3.7, and
-PyPy (our CI is configured to run PyPy tests on PyPy 4.0).
+The tox tests are configured to run on Python 3.6, 3.7, 3.8, 3.9, 3.10 and
+PyPy (our CI is configured to run PyPy tests on pypy-3.6, pypy-3.7, pypy-3.8).
 
 
 Questions, Bugs, and Feature Requests?
diff --git a/setup.py b/setup.py
index ac7dbf9b..2aa33181 100644
--- a/setup.py
+++ b/setup.py
@@ -14,9 +14,11 @@
     'Intended Audience :: Developers',
     'License :: OSI Approved :: Apache Software License',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: Implementation :: CPython',
     'Programming Language :: Python :: Implementation :: PyPy',
     'Operating System :: OS Independent',
@@ -69,9 +71,9 @@ def main():
         'sphinx',
         'sqlalchemy<1.4.0',
         'tox',
-        'pytest>=2.8.3, <4.0.0',
+        'pytest',
         'pytest-cov',
-        'pytest-xdist<1.28.0',
+        'pytest-xdist',
         'coveralls',
         'coverage',
         'tox-gh-actions',
diff --git a/test/unit/object/test_search.py b/test/unit/object/test_search.py
index e6374261..72a70051 100644
--- a/test/unit/object/test_search.py
+++ b/test/unit/object/test_search.py
@@ -67,11 +67,10 @@ def search_entries():
 
 
 @pytest.fixture
-def search_response():
-    entries = search_entries()
+def search_response(search_entries):
     return {
-        'entries': entries,
-        'total_count': len(entries),
+        'entries': search_entries,
+        'total_count': len(search_entries),
         'limit': 20,
         'offset': 0
     }
@@ -136,8 +135,8 @@ def search_with_shared_links_entries():
 
 
 @pytest.fixture
-def search_with_shared_links_response():
-    entries = search_with_shared_links_entries()
+def search_with_shared_links_response(search_with_shared_links_entries):
+    entries = search_with_shared_links_entries
     return {
         'entries': entries,
         'total_count': len(entries),
diff --git a/tox.ini b/tox.ini
index d94b27cb..fdfe3dea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ envlist =
   py38,
   pypy38,
   py39,
+  py310,
   rst,
   docs,
   coverage
@@ -27,6 +28,7 @@ python =
     3.8: py38
     pypy-3.8: pypy38
     3.9: py39
+    3.10: py310
 
 [testenv]
 commands =