diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 52eb072..4400067 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,93 +14,30 @@ defaults:
 
 
 jobs:
-  test-linux:
+  test:
     runs-on: ubuntu-latest
     name: 'Linux - Python'
     strategy:
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.13' ]
       fail-fast: false
     env:
-      DISPLAY: :0
       PY_MPV_SKIP_TESTS: >-
         test_wait_for_property_event_overflow
+      PY_MPV_TEST_VO: 'null'
     steps:
       - uses: actions/checkout@v4
       - name: 'Install Python'
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: 'Update Packages'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-
-          execute sudo apt update -y 
-          execute sudo apt upgrade -y
-      - name: 'Install Dependencies'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-
-          execute sudo apt install -y libmpv1 xvfb
-      - name: 'Start Xvfb'
-        run: |
-          echo -e "\033[0;34msudo /usr/bin/Xvfb $DISPLAY -screen 0 1920x1080x24 &\033[0m";
-          sudo /usr/bin/Xvfb $DISPLAY -screen 0 1920x1080x24 &
-      - name: 'Setup Test Environment'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-          
-          execute python -m venv venv
-          execute source venv/bin/activate
-          execute python -m pip install --upgrade pip
-          execute python -m pip install wheel
-          execute python -m pip install -r tests/requirements.txt
-      - name: 'Run Python Tests'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-          
-          execute source venv/bin/activate
-          execute xvfb-run python -m unittest
-
-  test-windows:
-    runs-on: windows-latest
-    name: 'Windows - Python'
-    strategy:
-      matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12' ]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - name: 'Install Python'
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
-          python-version: ${{ matrix.python-version }}
-      - name: 'Provide libmpv'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-          
-          ARTIFACT="mpv-dev-x86_64-v3-20240121-git-a39f9b6.7z"
-          SHA1="0764a4b899a7ebb1476e5b491897c5e2eed8a07f"
-          URL="https://sourceforge.net/projects/mpv-player-windows/files/libmpv/$ARTIFACT"
-          
-          execute curl -L -O "$URL"
-          echo -e "\033[0;34mecho -n $SHA1 $ARTIFACT > $ARTIFACT.sha1\033[0m"
-          echo -n "$SHA1 $ARTIFACT" > "$ARTIFACT.sha1"
-          execute sha1sum --check "$ARTIFACT.sha1"
-          execute 7z x "$ARTIFACT"
-          execute mv libmpv-2.dll tests
+          enable-cache: false
+      - name: 'Install Dependencies'
+        run: sudo apt install -y libmpv2
       - name: 'Setup Test Environment'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-
-          execute python -m venv venv
-          execute source venv/Scripts/activate
-          execute python -m pip install --upgrade pip
-          execute python -m pip install wheel
-          execute python -m pip install -r tests/requirements.txt
+        run: uv sync --extra test
       - name: 'Run Python Tests'
-        run: |
-          function execute() { echo -e "\033[0;34m$*\033[0m"; "$@"; }
-
-          execute source venv/Scripts/activate
-          execute python -m unittest
+        run: uv run -m pytest --reruns 3 --reruns-delay 3
diff --git a/pyproject.toml b/pyproject.toml
index dbea61f..5e4fb7e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,4 +36,8 @@ homepage = "https://github.com/jaseg/python-mpv"
 
 [project.optional-dependencies]
 screenshot_raw = ["Pillow"]
-test = ['PyVirtualDisplay']
+test = [
+    'PyVirtualDisplay',
+    'pytest',
+    'pytest-rerunfailures'
+]
diff --git a/tests/requirements.txt b/tests/requirements.txt
deleted file mode 100644
index eabe145..0000000
--- a/tests/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-PyVirtualDisplay>=3.0
diff --git a/tests/test_mpv.py b/tests/test_mpv.py
index 9c42332..1d04cf4 100755
--- a/tests/test_mpv.py
+++ b/tests/test_mpv.py
@@ -36,7 +36,7 @@
 
 else:
   from pyvirtualdisplay import Display
-  testvo='x11'
+  testvo=os.environ.get('PY_MPV_TEST_VO', 'x11')
 
 
 TESTVID = os.path.join(os.path.dirname(__file__), 'test.webm')
@@ -990,4 +990,3 @@ def t(self, *args, **kw):
         m.slang = 'ru'
         m.terminate() # needed for synchronization of event thread
         handler.assert_has_calls([mock.call('slang', ['jp']), mock.call('slang', ['ru'])])
-