diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b877487a..dc1fc9ed 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
     continue-on-error: ${{ matrix.python-version == 'pypy3' }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
index adc63f15..9f98bf06 100644
--- a/bpython/test/test_curtsies_painting.py
+++ b/bpython/test/test_curtsies_painting.py
@@ -139,6 +139,14 @@ def test_completion(self):
                 "└──────────────────────────────┘",
                 "Welcome to bpython! Press <F1> f",
             ]
+            if sys.version_info[:2] < (3, 10)
+            else [
+                ">>> an",
+                "┌──────────────────────────────┐",
+                "│ and    anext( any(           │",
+                "└──────────────────────────────┘",
+                "Welcome to bpython! Press <F1> f",
+            ]
         )
         self.assert_paint_ignoring_formatting(screen, (0, 4))
 
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
index 9b93672c..fbddadbe 100644
--- a/bpython/test/test_interpreter.py
+++ b/bpython/test/test_interpreter.py
@@ -35,7 +35,19 @@ def test_syntaxerror(self):
 
         i.runsource("1.1.1.1")
 
-        if sys.version_info[:2] >= (3, 8):
+        if sys.version_info[:2] >= (3, 10):
+            expected = (
+                "  File "
+                + green('"<bpython-input-148>"')
+                + ", line "
+                + bold(magenta("1"))
+                + "\n    1.1.1.1\n    ^^^^^\n"
+                + bold(red("SyntaxError"))
+                + ": "
+                + cyan("invalid syntax. Perhaps you forgot a comma?")
+                + "\n"
+            )
+        elif (3, 8) <= sys.version_info[:2] <= (3, 9):
             expected = (
                 "  File "
                 + green('"<input>"')