diff --git a/.github/workflows/pytest-remote-data.yml b/.github/workflows/pytest-remote-data.yml
index f74fd38ad8..64c30a0097 100644
--- a/.github/workflows/pytest-remote-data.yml
+++ b/.github/workflows/pytest-remote-data.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
         suffix: ['']  # the alternative to "-min"
         include:
           - python-version: 3.9
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 1f2810ad0f..a91af26d79 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false  # don't cancel other matrix jobs when one fails
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.9, "3.10", "3.11", "3.12"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
         environment-type: [conda, bare]
         suffix: ['']  # placeholder as an alternative to "-min"
         include:
diff --git a/ci/requirements-py3.13.yml b/ci/requirements-py3.13.yml
new file mode 100644
index 0000000000..17508bfe87
--- /dev/null
+++ b/ci/requirements-py3.13.yml
@@ -0,0 +1,28 @@
+name: test_env
+channels:
+    - defaults
+    - conda-forge
+dependencies:
+    - coveralls
+    - cython
+    - ephem
+    - h5py
+    # - numba  # not available for py3.13 as of Dec 2024
+    - numpy >= 1.17.3
+    - pandas >= 1.3.0
+    - pip
+    - pytest
+    - pytest-cov
+    - pytest-mock
+    - requests-mock
+    - pytest-timeout
+    - pytest-rerunfailures
+    - conda-forge::pytest-remotedata  # version in default channel is old
+    - python=3.13
+    - pytz
+    - requests
+    - scipy >= 1.6.0
+    - statsmodels
+    # - pip:
+        # - nrel-pysam>=2.0  # not available for py3.13 as of Dec 2024
+        # - solarfactors  # required shapely<2 isn't available for Python>=3.12
diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst
index 238ec1e9a6..7411e37b99 100644
--- a/docs/sphinx/source/whatsnew/v0.11.3.rst
+++ b/docs/sphinx/source/whatsnew/v0.11.3.rst
@@ -18,6 +18,7 @@ Documentation
 
 Testing
 ~~~~~~~
+* Added Python 3.12 to test suite. (:pull:`2258`)
 
 
 Requirements