diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
index f03c5f435f9..82708151ad6 100644
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -108,13 +108,13 @@ stages:
     steps:
     - template: templates/azp-step-cache.yaml@azure
       parameters:
-        keyfile: 'requirements_test_all.txt | homeassistant/package_constraints.txt'
+        keyfile: 'requirements_test_all.txt | homeassistant/package_constraints.txt | "v2"'
         build: |
           set -e
           python -m venv venv
 
           . venv/bin/activate
-          pip install -U pip setuptools pytest-azurepipelines -c homeassistant/package_constraints.txt
+          pip install -U pip setuptools pytest-azurepipelines pytest-xdist -c homeassistant/package_constraints.txt
           pip install -r requirements_test_all.txt -c homeassistant/package_constraints.txt
           # This is a TEMP. Eventually we should make sure our 4 dependencies drop typing.
           # Find offending deps with `pipdeptree -r -p typing`
@@ -127,7 +127,7 @@ stages:
         set -e
 
         . venv/bin/activate
-        pytest --timeout=9 --durations=10 -qq -o console_output_style=count -p no:sugar tests
+        pytest --timeout=9 --durations=10 -n 2 --dist loadfile -qq -o console_output_style=count -p no:sugar tests
         script/check_dirty
       displayName: 'Run pytest for python $(python.container)'
       condition: and(succeeded(), ne(variables['python.container'], variables['PythonMain']))
@@ -135,7 +135,7 @@ stages:
         set -e
 
         . venv/bin/activate
-        pytest --timeout=9 --durations=10 --cov homeassistant --cov-report html -qq -o console_output_style=count -p no:sugar tests
+        pytest --timeout=9 --durations=10 -n 2 --dist loadfile --cov homeassistant --cov-report html -qq -o console_output_style=count -p no:sugar tests
         codecov --token $(codecovToken)
         script/check_dirty
       displayName: 'Run pytest for python $(python.container) / coverage'
diff --git a/tests/components/ps4/test_media_player.py b/tests/components/ps4/test_media_player.py
index d6eeb31695c..7bf93e37777 100644
--- a/tests/components/ps4/test_media_player.py
+++ b/tests/components/ps4/test_media_player.py
@@ -169,11 +169,6 @@ async def mock_ddp_response(hass, mock_status_data, games=None):
         await hass.async_block_till_done()
 
 
-async def test_async_setup_platform_does_nothing():
-    """Test setup platform does nothing (Uses config entries only)."""
-    await ps4.media_player.async_setup_platform(None, None, None)
-
-
 async def test_media_player_is_setup_correctly_with_entry(hass):
     """Test entity is setup correctly with entry correctly."""
     mock_entity_id = await setup_mock_component(hass)