diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5a801e0..05e4213 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,23 +13,22 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
         netapi:
           - "cherrypy"
           - "tornado"
         salt:
-          - "v3004.2"
-          - "v3005.1"
-          - "v3006.0"
-          - "master"
+          - "v3005.4"
+          - "v3006.4"
+          - "v3006.5"
         exclude:
           - py: "3.10"
-            salt: "v3004.2"
-          - py: "3.10"
-            salt: "v3005.1"
+            salt: "v3005.4"
+          - py: "3.11"
+            salt: "v3005.4"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4
diff --git a/tests/requirements.txt b/tests/requirements.txt
index b6a15e2..ded9362 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -4,7 +4,7 @@ pytest-rerunfailures
 pytest-cov
 pytest-salt-factories==0.912.2
 CherryPy
-setuptools_scm
+setuptools_scm==7.1.0
 importlib-metadata<5.0.0
 pyzmq<=20.0.0 ; python_version < "3.6"
 pyzmq>=17.0.0 ; python_version < "3.9"
diff --git a/tox.ini b/tox.ini
index 35df1fa..4c6d5d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,14 @@
 [tox]
-envlist = py{3.7,3.8,3.9}-{cherrypy,tornado}-{v3004.2,v3005.1,v3006.0,master},py{3.10}-{cherrypy,tornado}-{v3006.0,master},coverage,flake8
+envlist = py{3.8,3.9}-{cherrypy,tornado}-{v3005.4},py{3.10,3.11}-{cherrypy,tornado}-{v3006.4, v3006.5},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
 [testenv]
 passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
-    v3004.2: salt==3004.2
-    v3004.2: jinja2<3.1
-    v3005.1: salt==3005.1
-    v3006.0: salt==3006.0
-    master: git+https://github.com/saltstack/salt.git@master#egg=salt
+    v3005.4: salt==3005.4
+    v3006.4: salt==3006.4
+    v3006.5: salt==3006.5
 
 changedir = {toxinidir}
 setenv = COVERAGE_FILE = {toxworkdir}/.coverage.{envname}
@@ -45,7 +43,7 @@ commands = codecov --file "{toxworkdir}/coverage.xml"
 
 [testenv:http]
 skip_install = True
-basepython = python36
+basepython = python39
 deps =
 changedir = {toxinidir}/htmlcov
 commands = python -m http.server