diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7faa180..95074c7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ workflows:
       - test-python-3.6
       - test-python-3.7
       - test-python-3.8
+      - test-python-3.9
 jobs:
   test-python-3.6: &build-template
     working_directory: ~/SunPower/pvfactors
@@ -56,3 +57,7 @@ jobs:
     <<: *build-template
     docker:
       - image: circleci/python:3.8.7
+  test-python-3.9:
+    <<: *build-template
+    docker:
+      - image: circleci/python:3.9.7-buster
diff --git a/README.rst b/README.rst
index 165f028..0c1bb59 100644
--- a/README.rst
+++ b/README.rst
@@ -165,7 +165,7 @@ The users can also create a "report" while running the simulations that will rel
 Installation
 ------------
 
-pvfactors is currently compatible and tested with Python 2 and 3, and is available in `PyPI <https://pypi.org/project/pvfactors/>`_. The easiest way to install pvfactors is to use pip_ as follows:
+pvfactors is currently compatible and tested with 3.6+, and is available in `PyPI <https://pypi.org/project/pvfactors/>`_. The easiest way to install pvfactors is to use pip_ as follows:
 
 .. code:: sh
 
diff --git a/docs/sphinx/installation/index.rst b/docs/sphinx/installation/index.rst
index e28a478..5877f7a 100644
--- a/docs/sphinx/installation/index.rst
+++ b/docs/sphinx/installation/index.rst
@@ -7,7 +7,7 @@ Installation
 Install with pip
 ----------------
 
-``pvfactors`` works with both python 2 and 3.
+``pvfactors`` currently supports python 3.6+.
 
 The easiest way to install ``pvfactors`` is using pip_:
 
diff --git a/docs/sphinx/whatsnew/v1.5.2.rst b/docs/sphinx/whatsnew/v1.5.2.rst
index 06839e3..0bf7281 100644
--- a/docs/sphinx/whatsnew/v1.5.2.rst
+++ b/docs/sphinx/whatsnew/v1.5.2.rst
@@ -3,6 +3,11 @@
 v1.5.2 (DATE XX, 2021)
 ======================
 
+Enhancements
+------------
+
+* Add python 3.9 to test configuration (:ghpull:`122`)
+
 Fixes
 -----
 
diff --git a/setup.py b/setup.py
index 0559598..b877064 100644
--- a/setup.py
+++ b/setup.py
@@ -24,10 +24,10 @@
     'Operating System :: OS Independent',
     'Intended Audience :: Science/Research',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 2.7',
-    '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',
     'Topic :: Scientific/Engineering',
 ]