diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 98905c2..31dbb3b 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -21,11 +21,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install build twine
+          python -m pip install setuptools wheel twine
       - name: Build and publish
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          python -m build .
+          python setup.py sdist bdist_wheel 
           twine upload dist/*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2ec7c3b..8750100 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,6 +10,8 @@ jobs:
     strategy:
       matrix:
         python-version:
+          - '3.6'
+          - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
diff --git a/setup.py b/setup.py
index fe2932e..6d488ff 100644
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,9 @@ def get_version(rel_path):
     'coverage==4.*',
     'pytest>=4',
     'pytest-cov>=2',
-
     'flake8-builtins',
-    'flake8-commas',
+    # Cannot install on python 3.12
+    'flake8-commas ; python_version < "3.12"',
     'flake8-fixme',
     'flake8-print',
     'flake8-quotes',
@@ -75,11 +75,12 @@ def get_version(rel_path):
 
         'Programming Language :: Python',
         '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',
 
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Software Development :: Quality Assurance',