diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
index 2c62dbb..74b0166 100644
--- a/.github/workflows/test-and-build.yml
+++ b/.github/workflows/test-and-build.yml
@@ -59,7 +59,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-20.04, macos-11, windows-2022]
-                python: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+                python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
 
         steps:
             - name: Set up Python
diff --git a/setup.py b/setup.py
index 438b1a4..f6ea6ff 100644
--- a/setup.py
+++ b/setup.py
@@ -35,8 +35,6 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    test_loader="unittest:TestLoader",
-    test_suite="boolean.test_boolean",
     keywords="boolean expression, boolean algebra, logic, expression parser",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
@@ -54,7 +52,9 @@
             [
                 "pytest >= 6, != 7.0.0",
                 "pytest-xdist >= 2",
-                "twine",
+            ],
+        "linting":
+            [
                 "black",
                 "isort",
                 "pycodestyle",
diff --git a/tox.ini b/tox.ini
index 5134012..c19d5ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,5 @@
 [tox]
-envlist=py36,py37,py38,py39,310
+envlist=py39,py310,py311,py312,py313,py314
 [testenv]
-commands=python setup.py test
\ No newline at end of file
+extras=testing
+commands=pytest -vvs boolean
\ No newline at end of file