diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index c310fc9..1c432e4 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.10', '3.11', '3.12']
         WITH_PANDAS: [false, true]
 
     steps:
@@ -27,8 +27,13 @@ jobs:
     - name: Install dependencies
       env:
         WITH_PANDAS: ${{ matrix.WITH_PANDAS }}
+      # Install setuptools for the newer versions
+      # https://docs.python.org/3/whatsnew/3.12.html
       run: |
         python -m pip install --upgrade pip
+        if [ "$(python --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)" = "3.12" ]; then
+          pip install setuptools
+        fi
         python setup.py develop
         python -m pip install flake8 pytest-cov coverage vcrpy black
         tools/install_pandas.sh
diff --git a/setup.py b/setup.py
index eaa66b2..692f871 100644
--- a/setup.py
+++ b/setup.py
@@ -66,9 +66,11 @@ def read(*filenames, **kwargs):
         'Natural Language :: English',
         'Topic :: Office/Business :: Financial :: Investment',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     test_suite='tests',
     tests_require=test_requirements,