diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 163ff247..51746939 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -85,12 +85,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        version: ['3.9', '3.10']
+        version: ['3.10', '3.11']
         include:
-          - version: '3.9'
-            tox-env: pypy39
           - version: '3.10'
             tox-env: pypy310
+          - version: '3.11'
+            tox-env: pypy311
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 535c60cd..4908a437 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  * Optimised mainstream seq-consuming functions by coercing their inputs into `seq` upfront (#1234)
  * Renamed `awith` and `afor` to `with-async` and `for-async` for improved clarity (#1248)
  * `basilisp.main.init` will only initialize the runtime environment on the first invocation (#1242)
+ * Updated support for PyPy to 3.9 and 3.10 (#1265)
 
 ### Fixed
  * Fix a bug where protocols with methods with leading hyphens in the could not be defined (#1230)
diff --git a/Makefile b/Makefile
index 383c7944..d7829b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,7 @@ clean:
 pypy-shell:
 	@docker run -it \
 		--mount src=`pwd`,target=/usr/src/app,type=bind \
+		--mount src="${HOME}/.local/share/basilisp",target="/root/.local/share/basilisp",type=bind \
 		--workdir /usr/src/app \
-		pypy:3.10-7.3-slim-buster \
+		pypy:3.10-7.3-slim \
 		/bin/sh -c 'pip install -e . && basilisp repl'
diff --git a/docs/compiler.rst b/docs/compiler.rst
index 34869384..00821cc0 100644
--- a/docs/compiler.rst
+++ b/docs/compiler.rst
@@ -40,7 +40,6 @@ The following settings enable and disable warnings from the Basilisp compiler du
   * Environment Variable: ``BASILISP_WARN_ON_ARITY_MISMATCH``
   * Default: ``true``
 
-
 * ``warn-on-shadowed-name`` - if ``true``, emit warnings if a local name is shadowed by another local name
 
   * Environment Variable: ``BASILISP_WARN_ON_SHADOWED_NAME``