diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9607bcdfb..650ff3788 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -152,6 +152,41 @@ jobs:
           paths:
               - src/coverage/.coverage.py39
 
+  unittest_310:
+    docker:
+      - image: continuumio/miniconda3
+    working_directory: /tmp/src/tedana
+    steps:
+      - checkout
+      - restore_cache:
+          key: conda-py310-v1-{{ checksum "setup.cfg" }}
+      - run:
+          name: Generate environment
+          command: |
+            apt-get update
+            apt-get install -yqq make
+            if [ ! -d /opt/conda/envs/tedana_py310 ]; then
+              conda create -yq -n tedana_py310 python=3.10
+              source activate tedana_py310
+              pip install .[tests]
+            fi
+      - run:
+          name: Running unit tests
+          command: |
+            source activate tedana_py310
+            make unittest
+            mkdir /tmp/src/coverage
+            mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.py310
+      - save_cache:
+          key: conda-py310-v1-{{ checksum "setup.cfg" }}
+          paths:
+              - /opt/conda/envs/tedana_py310
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+              - src/coverage/.coverage.py310
+
+
   style_check:
     docker:
       - image: continuumio/miniconda3
@@ -318,12 +353,14 @@ workflows:
             - makeenv_37
       - unittest_38
       - unittest_39
+      - unittest_310
       - merge_coverage:
           requires:
             - unittest_36
             - unittest_37
             - unittest_38
             - unittest_39
+            - unittest_310
             - three-echo
             - four-echo
             - five-echo
diff --git a/setup.cfg b/setup.cfg
index 375e2e04f..ea9161b05 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 python_requires = >= 3.6