diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a7b38db59f..9a46ac59fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -97,7 +97,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ${{ fromJSON(needs.setup.outputs.python_versions) }}
-        os: ["windows-latest", "public-ubuntu-latest-16-cores"]
+        os: ["windows-latest", "ubuntu-latest"]
 
     steps:
       - uses: actions/checkout@v4
@@ -134,7 +134,7 @@ jobs:
         run: |
           if [ ${{ inputs.test_any }} == 'true' ]; then
               export platform="any" 
-          elif [ ${{ matrix.os }} == "public-ubuntu-latest-16-cores" ]; then
+          elif [ ${{ matrix.os }} == "ubuntu-latest" ]; then
               export platform="manylinux_2_17"
           else
               export platform="win"
@@ -220,13 +220,13 @@ jobs:
         shell: bash
         run: |
           if [ $MODE == 'PIP' ]; then
-            if [ ${{ matrix.os }} == 'public-ubuntu-latest-16-cores' ]; then
+            if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then
               echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}" -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0"' >> "$GITHUB_OUTPUT"
             else
               echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{inputs.ANSYS_VERSION}}"' >> "$GITHUB_OUTPUT"
             fi
           else
-            if [ ${{ matrix.os }} == 'public-ubuntu-latest-16-cores' ]; then
+            if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then
               echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0"' >> "$GITHUB_OUTPUT"
             else
               echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }}' >> "$GITHUB_OUTPUT"
diff --git a/requirements/requirements_test.txt b/requirements/requirements_test.txt
index 5501bacabe..2a1218b197 100644
--- a/requirements/requirements_test.txt
+++ b/requirements/requirements_test.txt
@@ -6,6 +6,5 @@ pytest==8.3.4
 pytest-cov==5.0.0
 pytest-order==1.3.0
 pytest-rerunfailures==15.0
-pytest-xdist==3.6.1
 pyvista==0.44.2
 vtk==9.3.1
diff --git a/tox.ini b/tox.ini
index b98ef70eb4..30917f852e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -155,7 +155,7 @@ setenv =
     TMP = {env_tmp_dir}
 
 commands =
-    python -m pytest {env:PYTEST_PYTHON_FILES} {env:DEBUG} {env:COVERAGE} {env:RERUNS} {env:JUNITXML} {posargs}
+    python -m pytest {env:PYTEST_PYTHON_FILES} {env:DEBUG} {env:RERUNS} #{env:DEBUG} {env:COVERAGE} {env:RERUNS} {env:JUNITXML} {posargs}
 
 [testenv:doc-{clean,links,html}]
 description = Environment for documentation generation