diff --git a/framework/base/config/test-containers.xml b/framework/base/config/test-containers.xml
index 520d7c0..c9f324c 100644
--- a/framework/base/config/test-containers.xml
+++ b/framework/base/config/test-containers.xml
@@ -163,7 +163,7 @@
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="8081"/>
+            <property name="port" value="8080"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
@@ -201,7 +201,7 @@
             <property name="maxThreads" value="100"/>
             <property name="minSpareThreads" value="4"/>
             <property name="noCompressionUserAgents" value=""/>
-            <property name="port" value="8444"/>
+            <property name="port" value="8443"/>
             <property name="restrictedUserAgents" value=""/>
             <property name="server" value=""/>
             <property name="socketBuffer" value="9000"/>
diff --git a/framework/common/servicedef/services_test.xml b/framework/common/servicedef/services_test.xml
index 762f9d9..9cf42cf 100644
--- a/framework/common/servicedef/services_test.xml
+++ b/framework/common/servicedef/services_test.xml
@@ -83,20 +83,20 @@
     <service name="groupTest" engine="group" location="testGroup" invoke=""/>
 
     <service name="testHttp" engine="http"
-            location="http://localhost:8081/webtools/control/httpService" invoke="testScv">
+            location="http://localhost:8080/webtools/control/httpService" invoke="testScv">
         <description>HTTP service wrapper around the test service</description>
         <attribute name="message" type="String" mode="IN" optional="true"/>
         <attribute name="resp" type="String" mode="OUT"/>
     </service>
 
     <service name="testSoap" engine="soap" export="true"
-            location="http://localhost:8081/webtools/control/SOAPService" invoke="testSOAPScv">
+            location="http://localhost:8080/webtools/control/SOAPService" invoke="testSOAPScv">
         <description>SOAP service; calls the OFBiz test SOAP service</description>
         <implements service="testSOAPScv"/>
     </service>
     
     <service name="testSoapSimple" engine="soap" export="true"
-            location="http://localhost:8081/webtools/control/SOAPService" invoke="testScv">
+            location="http://localhost:8080/webtools/control/SOAPService" invoke="testScv">
         <description>simple SOAP service; calls the OFBiz test service</description>
         <implements service="testScv"/>
     </service>
diff --git a/framework/service/config/serviceengine.xml b/framework/service/config/serviceengine.xml
index 6fb6cf6..5b67bb7 100644
--- a/framework/service/config/serviceengine.xml
+++ b/framework/service/config/serviceengine.xml
@@ -63,12 +63,11 @@
         <engine name="ofbiz-workflow" class="org.ofbiz.workflow.WorkflowEngine"/>
         <engine name="workflow" class="org.ofbiz.shark.service.SharkServiceEngine"/>
         <!-- The engine xml-rpc-local is only used by a test service and for
-             this reason it is configured to run on port 8081 (see test-containers.xml);
-             in order to use this in OFBiz change the port accordingly (for demo the default
-             value is 8080)
+             this reason it is configured to run on port 8080 (see rmi-dispatcher in service/ofbiz-component.xml);
+             in order to use this in OFBiz change the port accordingly (for demo the default value is 8080)
         -->
         <engine name="xml-rpc-local" class="org.ofbiz.service.engine.XMLRPCClientEngine">
-            <parameter name="url" value="http://localhost:8081/webtools/control/xmlrpc"/>
+            <parameter name="url" value="http://localhost:8080/webtools/control/xmlrpc"/>
             <parameter name="login" value="admin"/>
             <parameter name="password" value="ofbiz"/>
         </engine>
diff --git a/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java b/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
index 6185a0d..10360c4 100644
--- a/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
+++ b/framework/service/src/org/ofbiz/service/test/XmlRpcTests.java
@@ -37,7 +37,7 @@
 
     public static final String module = XmlRpcTests.class.getName();
     public static final String resource = "ServiceErrorUiLabels";
-    public static final String url = "http://localhost:8081/webtools/control/xmlrpc";
+    public static final String url = "http://localhost:8080/webtools/control/xmlrpc";
 
     public XmlRpcTests(String name) {
         super(name);