diff --git a/src/test/java/it/finanze/sanita/fse2/ms/edsclient/ConfigClientTest.java b/src/test/java/it/finanze/sanita/fse2/ms/edsclient/ConfigClientTest.java
new file mode 100644
index 0000000..63e93c3
--- /dev/null
+++ b/src/test/java/it/finanze/sanita/fse2/ms/edsclient/ConfigClientTest.java
@@ -0,0 +1,105 @@
+package it.finanze.sanita.fse2.ms.edsclient;
+
+import it.finanze.sanita.fse2.ms.edsclient.client.IConfigClient;
+import it.finanze.sanita.fse2.ms.edsclient.client.routes.ConfigClientRoutes;
+import it.finanze.sanita.fse2.ms.edsclient.dto.ConfigItemDTO;
+import it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static it.finanze.sanita.fse2.ms.edsclient.config.Constants.Profile.TEST;
+import static it.finanze.sanita.fse2.ms.edsclient.enums.ConfigItemTypeEnum.GENERIC;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@Slf4j
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@ActiveProfiles(TEST)
+class ConfigClientTest {
+
+    private static final ConfigItemTypeEnum specific = ConfigItemTypeEnum.EDS_CLIENT;
+
+    @Autowired
+    private IConfigClient config;
+
+    @MockBean
+    private RestTemplate client;
+
+    @Autowired
+    private ConfigClientRoutes routes;
+
+    @Test
+    @DisplayName("Get prop test with prop value different from previous")
+    void getPropTest(){
+        // Mock the it-gtw-config status
+        when(client.getForEntity(Mockito.anyString(), Mockito.eq(String.class))).thenReturn(ResponseEntity.ok().build());
+
+        String prop_name = "prop_name";
+        String expected = "true";
+        when(client.getForObject(routes.getConfigItem(specific, prop_name), String.class)).thenReturn(expected);
+
+        String actual = config.getProps(prop_name, "false", specific);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    @DisplayName("Get prop name with SPECIFIC prop not found")
+    void getPropTestWithSpecificPropNotFound(){
+        // Mock the it-gtw-config status
+        when(client.getForEntity(Mockito.anyString(), Mockito.eq(String.class))).thenReturn(ResponseEntity.ok().build());
+
+        String prop_name = "prop_name";
+        String expected = "true";
+        when(client.getForObject(routes.getConfigItem(specific, prop_name), String.class)).thenReturn(null);
+        when(client.getForObject(routes.getConfigItem(GENERIC, prop_name), String.class)).thenReturn(expected);
+
+
+        String actual = config.getProps(prop_name, "false", specific);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void getAllPropsTest(){
+        ConfigItemDTO expected = request();
+
+        when(client.getForObject(Mockito.anyString(), Mockito.eq(ConfigItemDTO.class))).thenReturn(expected);
+
+        ConfigItemDTO actual = config.getConfigurationItems(GENERIC);
+
+        assertEquals(expected.getTraceId(), actual.getTraceId());
+        assertEquals(expected.getSpanId(), actual.getSpanId());
+        assertEquals(expected.getConfigurationItems().size(), actual.getConfigurationItems().size());
+        assertEquals(expected.getConfigurationItems().get(0).getKey(), actual.getConfigurationItems().get(0).getKey());
+    }
+
+    private static ConfigItemDTO request() {
+        ConfigItemDTO.ConfigDataItemDTO dataItem = new ConfigItemDTO.ConfigDataItemDTO();
+        ConfigItemDTO expected = new ConfigItemDTO();
+        // Valorizzo le props di tipo FHIR-MAPPING-ENGINE
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("cfg-items-retention-day", "true");
+        dataItem.setKey(GENERIC.name());
+        dataItem.setItems(map);
+        // Creo la variabile di ritorno
+        List<ConfigItemDTO.ConfigDataItemDTO> props = new ArrayList<>();
+        props.add(dataItem);
+        expected.setTraceId("traceID");
+        expected.setSpanId("spanId");
+        expected.setConfigurationItems(props);
+        return expected;
+    }
+}