diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 5882bf1cf..e8aac3330 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -123,7 +123,6 @@ jobs:
         conda config --add channels conda-forge
         conda config --add channels scientific-python-nightly-wheels
         conda create -q -n pyav \
-          cython==3.1.0b0 \
           numpy \
           pillow \
           pytest \
@@ -135,6 +134,7 @@ jobs:
       run: |
         . $CONDA/etc/profile.d/conda.sh
         conda activate pyav
+        pip install 'Cython==3.1.0a1'
         python scripts\\fetch-vendor.py --config-file scripts\\ffmpeg-${{ matrix.config.ffmpeg }}.json $CONDA_PREFIX\\Library
         python scripts\\comptime.py  ${{ matrix.config.ffmpeg }}
         python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX\\Library
diff --git a/Makefile b/Makefile
index 84a36f2a8..4b4f58ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,8 @@ fate-suite:
 	rsync -vrltLW rsync://fate-suite.ffmpeg.org/fate-suite/ tests/assets/fate-suite/
 
 lint:
-	$(PIP) install -U black isort flake8 flake8-pyproject pillow numpy mypy==1.15.0 pytest
-	black --check av examples tests setup.py
-	flake8 av
+	$(PIP) install -U ruff isort pillow numpy mypy==1.15.0 pytest
+	ruff format --check av examples tests setup.py
 	isort --check-only --diff av examples tests
 	mypy av tests
 
diff --git a/pyproject.toml b/pyproject.toml
index 0bfb6cce9..458beee81 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -52,12 +52,3 @@ homepage = "https://pyav.basswood-io.com"
 profile = "black"
 known_first_party = ["av"]
 skip = ["av/__init__.py"]
-
-[tool.flake8]
-filename = ["*.py", "*.pyx", "*.pxd"]
-ignore = ["E203", "W503"]
-max-line-length = 142
-per-file-ignores = [
-    "__init__.py:E402,F401",
-    "*.pyx,*.pxd:E211,E225,E227,E402,E999",
-]
\ No newline at end of file
diff --git a/tests/test_decode.py b/tests/test_decode.py
index c1846af69..7ad722bfd 100644
--- a/tests/test_decode.py
+++ b/tests/test_decode.py
@@ -218,9 +218,9 @@ def test_hardware_decode(self) -> None:
             )
 
         HWACCEL_DEVICE_TYPE = os.environ["HWACCEL_DEVICE_TYPE"]
-        assert (
-            HWACCEL_DEVICE_TYPE in hwdevices_available
-        ), f"{HWACCEL_DEVICE_TYPE} not available"
+        assert HWACCEL_DEVICE_TYPE in hwdevices_available, (
+            f"{HWACCEL_DEVICE_TYPE} not available"
+        )
 
         test_video_path = "tests/assets/black.mp4"
         make_h264_test_video(test_video_path)