diff --git a/.github/workflows/check-test-release.yml b/.github/workflows/check-test-release.yml
index a1fae917..8825d3a4 100644
--- a/.github/workflows/check-test-release.yml
+++ b/.github/workflows/check-test-release.yml
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python: ["3.7", "3.8", "3.9", "3.10"]
+        python: ["3.8", "3.9", "3.10"]
         exclude:
         # no HDF5 support installed for tables
         - os: windows-latest
@@ -96,7 +96,6 @@ jobs:
         pip install --upgrade pip setuptools wheel
         pip install pre-commit .[tests]
     - run: pre-commit run pylint -a -v --show-diff-on-failure
-      if: matrix.python != '3.7'
     - name: Start minikube
       if: matrix.os == 'ubuntu-latest' && matrix.python == '3.9'
       uses: medyagh/setup-minikube@master
@@ -113,14 +112,18 @@ jobs:
         BITBUCKET_USERNAME: ${{ secrets.BITBUCKET_USERNAME }}
         BITBUCKET_PASSWORD: ${{ secrets.BITBUCKET_PASSWORD }}
     - name: Run Heroku tests
-      if: ${{ github.event_name == 'schedule' || contains(github.event.pull_request.title, 'heroku') }}
+      if: |
+        matrix.os == 'ubuntu-latest' &&
+        matrix.python == '3.8' &&
+        (
+          github.event_name == 'schedule' ||
+          contains(github.event.pull_request.title, 'heroku')
+        )
       timeout-minutes: 40
       run: pytest -k 'heroku'
       env:
         HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
         HEROKU_TEAM: iterative-sandbox
-        GITHUB_MATRIX_OS: ${{ matrix.os }}
-        GITHUB_MATRIX_PYTHON: ${{ matrix.python }}
     - name: "Upload coverage to Codecov"
       uses: codecov/codecov-action@v3
       with:
diff --git a/setup.py b/setup.py
index 658036ec..40f06353 100644
--- a/setup.py
+++ b/setup.py
@@ -129,10 +129,9 @@
     classifiers=[
         "Development Status :: 4 - Beta",
         "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",
     ],
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
diff --git a/tests/contrib/test_heroku.py b/tests/contrib/test_heroku.py
index 8cd80ba6..68e2072f 100644
--- a/tests/contrib/test_heroku.py
+++ b/tests/contrib/test_heroku.py
@@ -28,12 +28,11 @@
 )
 from mlem.core.errors import DeploymentError
 from mlem.core.objects import DeployStatus, MlemModel
-from tests.conftest import flaky, long, skip_matrix
+from tests.conftest import flaky, long
 
 heroku = pytest.mark.skipif(
     HEROKU_CONFIG.API_KEY is None, reason="No HEROKU_API_KEY env provided"
 )
-heroku_matrix = skip_matrix("ubuntu-latest", "3.7")
 HEROKU_TEST_APP_NAME_PREFIX = "mlem-test"
 CLEAR_APPS = False
 HEROKU_TEAM = os.environ.get("HEROKU_TEAM")
@@ -85,7 +84,6 @@ def test_heroku_api_request():
 
 @heroku
 @long
-@heroku_matrix
 def test_create_app(heroku_app_name, heroku_env, model):
     name = heroku_app_name("create-app")
     heroku_deploy = HerokuDeployment(
@@ -99,7 +97,6 @@ def test_create_app(heroku_app_name, heroku_env, model):
 
 
 @long
-@heroku_matrix
 def test_build_heroku_docker(model: MlemModel, uses_docker_build):
     image_meta = build_heroku_docker(model, "test_build", push=False)
     client = DockerClient.from_env()
@@ -163,7 +160,6 @@ def is_not_crash(err, *args):  # pylint: disable=unused-argument
 @flaky(rerun_filter=is_not_crash, max_runs=1)
 @heroku
 @long
-@heroku_matrix
 def test_env_deploy_full(
     tmp_path_factory,
     model: MlemModel,