diff --git a/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/client/VOSpaceClientTest.java b/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/client/VOSpaceClientTest.java
index 11a0b2abf6b5408553b59a6e3f4eb54cf557d1a8..bcf643dcb1ff2b7592f0b22ecdf7425addd87b4d 100644
--- a/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/client/VOSpaceClientTest.java
+++ b/vospace-ui-backend/src/test/java/it/inaf/ia2/vospace/ui/client/VOSpaceClientTest.java
@@ -15,7 +15,6 @@ import java.net.http.HttpClient;
 import java.net.http.HttpHeaders;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import javax.servlet.http.HttpServletRequest;
@@ -35,6 +34,7 @@ import static org.mockito.ArgumentMatchers.argThat;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -198,33 +198,24 @@ public class VOSpaceClientTest {
 
         assertEquals(ExecutionPhase.COMPLETED, voSpaceClient.getJobPhase("job_id"));
     }
-    
+
     @Test
     public void testSetNode() {
 
         ContainerNode node = new ContainerNode();
-        node.setUri("vos://ia2.inaf.it!vospace/mynode");
+        node.setUri("vos://ia2.inaf.it!vospace/my+node");
 
         CompletableFuture response = getMockedStreamResponseFuture(200, getResourceFileContent("node-response.xml"));
         when(mockedHttpClient.sendAsync(any(), any())).thenReturn(response);
 
         voSpaceClient.setNode(node, true);
-    }
-    
-    @Test
-    public void testSetNodeBadUri() {
 
-        ContainerNode node = new ContainerNode();
-        node.setUri("vos://ia2.inaf.it!vospace/not urlencoded");
-
-        try {
-            voSpaceClient.setNode(node, true);
-            fail("Exception was expected");
-        } catch (IllegalArgumentException ex) {
-            assertTrue(ex.getCause() instanceof URISyntaxException);
-        }
+        // verifying proper URL encoding of + char
+        verify(mockedHttpClient).sendAsync(argThat(req -> {
+            return req.uri().toString().contains("/nodes/my%2Bnode");
+        }), any());
     }
- 
+
     @Test
     public void testDeleteNode() {