diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 717e5227203..7ff716bd5df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,6 +55,10 @@ jobs:
             base_ref=${{ github.base_ref }}
             suffix=${ref_name/$sub[0-9][0-9][0-9]/''}
             suffix=${suffix/_on_$base_ref/''}
+          elif [[ "${{ github.base_ref  }}" == *"$sub"* ]]; then
+            base_ref=${{ github.base_ref }}
+            suffix=${base_ref/$sub[0-9][0-9][0-9]/''}
+            suffix=${suffix/_on_*/''}
           fi
           echo "suffix=$suffix" >> "$GITHUB_OUTPUT"
         fi
diff --git a/src/ansys/dpf/core/server_types.py b/src/ansys/dpf/core/server_types.py
index 98b87eaf749..4bf4517d32d 100644
--- a/src/ansys/dpf/core/server_types.py
+++ b/src/ansys/dpf/core/server_types.py
@@ -925,6 +925,12 @@ def __init__(
             self._context = server_context.AvailableServerContexts.premium
             pass
         self.set_as_global(as_global=as_global)
+        # Update the python os.environment
+        if not os.name == "posix":
+            new_path = subprocess.check_output(
+                ["python", "-c", r'import os; print(os.environ["PATH"])'], text=True
+            )  # pragma: no cover
+            os.environ["PATH"] = new_path
 
     @property
     def version(self):
diff --git a/tests/test_remote_operator.py b/tests/test_remote_operator.py
index dccbdf0fbe9..a323791f565 100644
--- a/tests/test_remote_operator.py
+++ b/tests/test_remote_operator.py
@@ -6,7 +6,6 @@
 import pytest
 
 
-@pytest.mark.skip
 @pytest.mark.skipif(
     not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
     reason="Connecting data from different servers is " "supported starting server version 3.0",
@@ -21,7 +20,6 @@ def test_connect_remote_operators(simple_bar):
     assert np.allclose(fc[0].data, 2 * op1.outputs.fields_container()[0].data)
 
 
-@pytest.mark.skip
 @pytest.mark.skipif(
     not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_3_0,
     reason="Connecting data from different servers is " "supported starting server version 3.0",
@@ -36,7 +34,6 @@ def test_connect_3remote_operators(simple_bar):
     assert np.allclose(fc[0].data, 2 * op1.outputs.fields_container()[0].data)
 
 
-@pytest.mark.skip
 @pytest.mark.skipif(
     not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_4_0,
     reason="Connecting data from different servers is " "supported starting server version 4.0",