diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java
index 832dc532f..88ff4ae2a 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/LoadBalanceEndpointSerializationTest.java
@@ -60,17 +60,17 @@ public void testLoadBalanceEndpointScenarioOneWithParameterInjection() throws Ex
                 "<session type=\"simpleClientSession\"/>" +
                 "<loadbalance algorithm=\"org.apache.synapse.endpoints.algorithms.RoundRobin\">" +
                 "<endpoint>" +
-                "<address uri=\"$SYSTEM:LOAD_BALANCE_TEST_ENDPOINT1\">" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT1\">" +
                 "<enableAddressing/>" +
                 "</address>" +
                 "</endpoint>" +
                 "<endpoint>" +
-                "<address uri=\"$SYSTEM:LOAD_BALANCE_TEST_ENDPOINT2\">" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT2\">" +
                 "<enableAddressing/>" +
                 "</address>" +
                 "</endpoint>" +
                 "<endpoint>" +
-                "<address uri=\"$SYSTEM:LOAD_BALANCE_TEST_ENDPOINT3\">" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT3\">" +
                 "<enableAddressing/>" +
                 "</address>" +
                 "</endpoint>" +
diff --git a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/RecipientListEndpointSerializationTest.java b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/RecipientListEndpointSerializationTest.java
index 5d82ff044..f27c099c8 100644
--- a/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/RecipientListEndpointSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/synapse/config/xml/endpoints/RecipientListEndpointSerializationTest.java
@@ -54,6 +54,35 @@ public void testRecipientListEndpointScenarioOne()throws Exception {
         assertTrue(compare(serializedOut, inputElement));
     }
 
+    public void testRecipientListEndpointScenarioOneWithParameterInjection() throws Exception {
+        String inputXml = "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
+                "<recipientlist>" +
+                "<endpoint>" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT1\">" +
+                "<enableAddressing/>" +
+                "</address>" +
+                "</endpoint>" +
+                "<endpoint>" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT2\">" +
+                "<enableAddressing/>" +
+                "</address>" +
+                "</endpoint>" +
+                "<endpoint>" +
+                "<address uri=\"$SYSTEM:SOAP_TEST_ENDPOINT3\">" +
+                "<enableAddressing/>" +
+                "</address>" +
+                "</endpoint>" +
+                "</recipientlist>" +
+                "</endpoint>";
+
+        OMElement inputElement = createOMElement(inputXml);
+        Endpoint endpoint = RecipientListEndpointFactory.getEndpointFromElement(
+                inputElement,true,null);
+        OMElement serializedOut = RecipientListEndpointSerializer.getElementFromEndpoint(endpoint);
+
+        assertTrue(compare(serializedOut, inputElement));
+    }
+
     public void testRecipientListEndpointScenarioTwo()throws Exception {
         String inputXml = "<endpoint xmlns=\"http://ws.apache.org/ns/synapse\">" +
                 "<recipientlist>" +
diff --git a/pom.xml b/pom.xml
index d1eb48472..8f1649707 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,9 +287,9 @@
                             <WSDL_SERVICE_TEST_URI>file:src/test/resources/esbservice.wsdl</WSDL_SERVICE_TEST_URI>
                             <WSDL_SERVICE_TEST_PORT>esbserviceSOAP11port_http</WSDL_SERVICE_TEST_PORT>
 
-                            <LOAD_BALANCE_TEST_ENDPOINT1>http://localhost:9001/soap/LBService1</LOAD_BALANCE_TEST_ENDPOINT1>
-                            <LOAD_BALANCE_TEST_ENDPOINT2>http://localhost:9002/soap/LBService1</LOAD_BALANCE_TEST_ENDPOINT2>
-                            <LOAD_BALANCE_TEST_ENDPOINT3>http://localhost:9003/soap/LBService1</LOAD_BALANCE_TEST_ENDPOINT3>
+                            <SOAP_TEST_ENDPOINT1>http://localhost:9001/soap/LBService1</SOAP_TEST_ENDPOINT1>
+                            <SOAP_TEST_ENDPOINT2>http://localhost:9002/soap/LBService1</SOAP_TEST_ENDPOINT2>
+                            <SOAP_TEST_ENDPOINT3>http://localhost:9003/soap/LBService1</SOAP_TEST_ENDPOINT3>
                             <scope>test</scope>
                         </environmentVariables>
                     </configuration>