diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c72bb971..df39f15a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -62,14 +62,6 @@ jobs:
       shell: bash -l {0}
       run: micromamba list
 
-    - name: Workaround OpenGL issue on Linux
-      if: runner.os == 'Linux'
-      shell: bash -l {0}
-      run: |
-        # referenced from https://github.com/pyvista/pyvista/blob/main/.github/workflows/vtk-pre-test.yml#L53
-        micromamba remove -y --force vtk
-        pip install --extra-index-url https://wheels.vtk.org trame vtk-osmesa
-
     - name: Install fonts on Linux
       if: runner.os == 'Linux'
       run: |
@@ -77,14 +69,8 @@ jobs:
         sudo apt-get install ttf-mscorefonts-installer fonts-liberation
         sudo rm -rf ~/.cache/matplotlib
 
-    - name: Install OpenGL on Windows
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: |
-        Set-StrictMode -Version Latest
-        $ErrorActionPreference = "Stop"
-        $PSDefaultParameterValues['*:ErrorAction']='Stop'
-        powershell .github/install_opengl.ps1
+    - name: Set up headless display
+      uses: pyvista/setup-headless-display-action@v4
 
     - name: Run tests
       shell: bash -l {0}
diff --git a/tests/test_notebooks.py b/tests/test_notebooks.py
index 46d6d63b..62d2fd84 100644
--- a/tests/test_notebooks.py
+++ b/tests/test_notebooks.py
@@ -23,7 +23,7 @@
 # platforms
 # Notebook : (platforms,), reason
 skip_notebooks = {
-    "10_modpath_particle_tracking-demo.ipynb" : [("darwin", "windows"), "transient timeout"]
+    "10_modpath_particle_tracking-demo.ipynb" : [("darwin"), "transient timeout"]
 }
 
 def included_notebooks():