From 5ddd9bb6cfce1eda72aade7be93118343e89aff6 Mon Sep 17 00:00:00 2001
From: kurobako <wyyyrd@gmail.com>
Date: Tue, 20 Nov 2018 12:44:57 +0100
Subject: [PATCH] WFLY-4336 Cannot run testsuite if an application holds port
 8080 open

---
 .../domain/DefaultConfigSmokeTestCase.java    |  4 +--
 .../cli/DeployAllServerGroupsTestCase.java    |  2 +-
 .../cli/DeploySingleServerGroupTestCase.java  |  2 +-
 .../DomainDeployWithRuntimeNameTestCase.java  |  2 +-
 .../management/cli/RolloutPlanTestCase.java   |  2 +-
 .../domain-configs/domain-minimal.xml         |  4 +--
 .../resources/domain-configs/domain-rbac.xml  |  6 ++--
 .../domain-configs/domain-respawn.xml         |  4 +--
 .../domain-configs/domain-standard-ee.xml     |  8 ++---
 .../domain-configs/domain-standard.xml        |  8 ++---
 .../domain-configs/domain.cached-remote.xml   |  2 +-
 .../symbolicLink/SymlinkingUnitTestCase.java  |  2 +-
 .../interceptor/security/EJBUtil.java         |  2 +-
 .../interceptor/security/api/EJBUtil.java     |  2 +-
 ...pBasedInitialContextEjbClientTestCase.java |  2 +-
 .../cdi/MDBRAScopeCdiIntegrationTestCase.java |  2 +-
 ...ientInterceptorsEJBAnnotationTestCase.java |  2 +-
 .../EJBClientInvocationTimeoutTestCase.java   |  2 +-
 .../ejb/remote/security/EJBUtil.java          |  2 +-
 .../RunAsPrincipalCustomDomainTestCase.java   |  2 +-
 .../exception/ExceptionEjbClientTestCase.java |  2 +-
 .../DuplicateIDIntegrationTestCase.java       |  2 +-
 .../runtime/ServletRuntimeNameTestCase.java   |  2 +-
 ...tefulEJBRemoteHomeRuntimeNameTestCase.java |  2 +-
 ...elessEJBRemoteHomeRuntimeNameTestCase.java |  2 +-
 .../runtime/TimerEJBRuntimeNameTestCase.java  |  2 +-
 .../mgmt/CoreQueueManagementTestCase.java     |  2 +-
 .../remote/multiple/CallEjbServlet.java       |  2 +-
 .../naming/remote/multiple/MyEjbBean.java     |  2 +-
 .../naming/remote/multiple/RunRmiServlet.java |  2 +-
 .../integration/web/VirtualHostTestCase.java  |  4 +--
 .../resources/jboss-ejb-client.properties     |  2 +-
 .../ejb/security/jboss-ejb-client.properties  |  2 +-
 .../jms/ClusteredMessagingTestCase.java       |  2 +-
 .../src/test/resources/wildfly-config.xml     |  2 +-
 .../timeout/IIOPTimeoutTestCase.java          |  2 +-
 .../resources/jboss-ejb-client.properties     |  2 +-
 ...ytronRemoteOutboundConnectionTestCase.java |  2 +-
 .../reconnect/jboss-ejb-client.properties     |  2 +-
 .../distributed/AbstractDwmTestCase.java      |  2 +-
 .../layered/LayeredDistributionTestCase.java  |  2 +-
 .../ha/AbstractMessagingHATestCase.java       |  2 +-
 .../security/SecuredDataSourceTestCase.java   |  2 +-
 ...ltSystemPropertyOnServerStartTestCase.java |  2 +-
 ...actSecurityContextPropagationTestBase.java |  2 +-
 .../resources/jboss-ejb-client.properties     |  2 +-
 .../resources/legacy-configs/domain/7-1-3.xml |  8 ++---
 .../resources/legacy-configs/domain/7-2-0.xml |  8 ++---
 .../legacy-configs/domain/eap-6-0-0.xml       |  8 ++---
 .../legacy-configs/domain/eap-6-1-0.xml       |  8 ++---
 .../legacy-configs/domain/eap-6-2-0.xml       |  8 ++---
 .../legacy-configs/domain/eap-6-3-0.xml       |  8 ++---
 .../legacy-configs/domain/eap-6-4-0.xml       |  8 ++---
 .../standalone/7-1-3-full-ha.xml              |  2 +-
 .../legacy-configs/standalone/7-1-3-full.xml  |  2 +-
 .../legacy-configs/standalone/7-1-3-ha.xml    |  2 +-
 .../standalone/7-1-3-hornetq-colocated.xml    |  2 +-
 .../legacy-configs/standalone/7-1-3-jts.xml   |  2 +-
 .../legacy-configs/standalone/7-1-3-xts.xml   |  4 +--
 .../legacy-configs/standalone/7-1-3.xml       |  2 +-
 .../standalone/7-2-0-full-ha.xml              |  2 +-
 .../legacy-configs/standalone/7-2-0-full.xml  |  2 +-
 .../legacy-configs/standalone/7-2-0-ha.xml    |  2 +-
 .../standalone/7-2-0-hornetq-colocated.xml    |  2 +-
 .../legacy-configs/standalone/7-2-0-jts.xml   |  2 +-
 .../legacy-configs/standalone/7-2-0-xts.xml   |  4 +--
 .../legacy-configs/standalone/7-2-0.xml       |  2 +-
 .../standalone/eap-6-0-0-full-ha.xml          |  2 +-
 .../standalone/eap-6-0-0-full.xml             |  2 +-
 .../standalone/eap-6-0-0-ha.xml               |  2 +-
 .../eap-6-0-0-hornetq-colocated.xml           |  2 +-
 .../standalone/eap-6-0-0-jts.xml              |  2 +-
 .../standalone/eap-6-0-0-xts.xml              |  4 +--
 .../legacy-configs/standalone/eap-6-0-0.xml   |  2 +-
 .../standalone/eap-6-1-0-full-ha.xml          |  2 +-
 .../standalone/eap-6-1-0-full.xml             |  2 +-
 .../standalone/eap-6-1-0-ha.xml               |  2 +-
 .../eap-6-1-0-hornetq-colocated.xml           |  2 +-
 .../standalone/eap-6-1-0-jts.xml              |  2 +-
 .../standalone/eap-6-1-0-xts.xml              |  4 +--
 .../legacy-configs/standalone/eap-6-1-0.xml   |  2 +-
 .../standalone/eap-6-2-0-full-ha.xml          |  2 +-
 .../standalone/eap-6-2-0-full.xml             |  2 +-
 .../standalone/eap-6-2-0-ha.xml               |  2 +-
 .../eap-6-2-0-hornetq-colocated.xml           |  2 +-
 .../standalone/eap-6-2-0-jts.xml              |  2 +-
 .../standalone/eap-6-2-0-xts.xml              |  4 +--
 .../legacy-configs/standalone/eap-6-2-0.xml   |  2 +-
 .../standalone/eap-6-3-0-full-ha.xml          |  2 +-
 .../standalone/eap-6-3-0-full.xml             |  2 +-
 .../standalone/eap-6-3-0-ha.xml               |  2 +-
 .../eap-6-3-0-hornetq-colocated.xml           |  2 +-
 .../standalone/eap-6-3-0-jts.xml              |  2 +-
 .../standalone/eap-6-3-0-picketlink.xml       | 34 +++++++++----------
 .../standalone/eap-6-3-0-xts.xml              |  4 +--
 .../legacy-configs/standalone/eap-6-3-0.xml   |  2 +-
 .../standalone/eap-6-4-0-full-ha.xml          |  2 +-
 .../standalone/eap-6-4-0-full.xml             |  2 +-
 .../standalone/eap-6-4-0-ha.xml               |  2 +-
 .../eap-6-4-0-hornetq-colocated.xml           |  2 +-
 .../standalone/eap-6-4-0-jts.xml              |  2 +-
 .../standalone/eap-6-4-0-picketlink.xml       | 34 +++++++++----------
 .../standalone/eap-6-4-0-xts.xml              |  4 +--
 .../legacy-configs/standalone/eap-6-4-0.xml   |  2 +-
 .../standalone/eap-7-0-0-picketlink.xml       | 32 ++++++++---------
 .../standalone/eap-7-0-0-xts.xml              |  2 +-
 .../standalone/eap-7-1-0-picketlink.xml       | 32 ++++++++---------
 .../standalone/eap-7-1-0-xts.xml              |  2 +-
 .../federation/SAMLIDPInitiatedTestCase.java  |  2 +-
 .../picketlink/federation/idp-metadata.xml    | 16 ++++-----
 .../picketlink/federation/sp-metadata1.xml    | 16 ++++-----
 .../picketlink/federation/sp-metadata2.xml    | 16 ++++-----
 .../subsystem/MaximumPermissionsTestCase.java |  2 +-
 .../resources/jboss-ejb-client.properties     |  2 +-
 .../eardeployment/EarDeploymentTestCase.java  |  2 +-
 .../SocketBindingBoundPortsTestCase.java      |  2 +-
 .../src/test/scripts/manualmode-build.xml     |  2 +-
 .../session/SessionInvalidateTestCase.java    |  2 +-
 .../session/SessionManagementTestCase.java    |  4 +--
 .../session/SessionPersistenceTestCase.java   |  2 +-
 .../sharedsession/SharedSessionTestCase.java  | 16 ++++-----
 .../AuthenticationPolicyContextTestCase.java  |  2 +-
 .../ws/schemalocations/SimpleService.wsdl     |  2 +-
 .../imported/AnotherService.wsdl              |  2 +-
 .../ws/serviceref/ServiceRefEarTestCase.java  |  2 +-
 .../serviceref/ServiceRefSevletTestCase.java  |  2 +-
 .../ws/serviceref/ServiceRefTestCase.java     |  2 +-
 .../ws/serviceref/TestService.wsdl            |  2 +-
 .../ws/wsa/NoAddressingService.xml            |  2 +-
 .../ws/wsa/OptionalAddressingService.xml      |  2 +-
 .../ws/wsa/RequiredAddressingService.xml      |  2 +-
 .../integration/ws/wsrm/ReliableService.wsdl  |  2 +-
 .../ws/wsse/trust/WEB-INF/picketlink-sts.xml  |  4 +--
 .../wsse/trust/WEB-INF/wsdl/ActAsService.wsdl |  4 +--
 .../trust/WEB-INF/wsdl/BearerService.wsdl     |  2 +-
 .../WEB-INF/wsdl/HolderOfKeyService.wsdl      |  2 +-
 .../trust/WEB-INF/wsdl/OnBehalfOfService.wsdl |  4 +--
 .../trust/WEB-INF/wsdl/PicketLinkSTS.wsdl     |  2 +-
 .../trust/WEB-INF/wsdl/SecurityService.wsdl   |  4 +--
 .../wsdl/bearer-ws-trust-1.4-service.wsdl     |  2 +-
 .../holderofkey-ws-trust-1.4-service.wsdl     |  2 +-
 .../WEB-INF/wsdl/ws-trust-1.4-service.wsdl    |  2 +-
 .../ws/wsse/trust/WSTrustTestCase.java        |  2 +-
 .../SecurityService-ejb-sign-encrypt.wsdl     |  2 +-
 .../wsse/wsdl/SecurityService-ejb-sign.wsdl   |  2 +-
 .../wsdl/SecurityService-sign-encrypt.wsdl    |  2 +-
 .../ws/wsse/wsdl/SecurityService-sign.wsdl    |  2 +-
 .../resources/jboss-ejb-client.properties     |  2 +-
 .../as/test/xts/wsat/client/ATClient.java     |  3 +-
 .../client/BACoordinatorCompletionClient.java |  2 +-
 .../client/BAParticipantCompletionClient.java |  2 +-
 .../domain/mixed/LegacyConfigTest.java        |  2 +-
 .../domain/mixed/SimpleMixedDomainTest.java   |  2 +-
 .../master-config/domain-minimal.xml          |  4 +--
 154 files changed, 290 insertions(+), 291 deletions(-)

diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DefaultConfigSmokeTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DefaultConfigSmokeTestCase.java
index a9663d7a7dd..0aa12dac0a5 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DefaultConfigSmokeTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/DefaultConfigSmokeTestCase.java
@@ -64,7 +64,7 @@ public void testStandardHost() throws Exception {
         try {
             utils.start();
             // Double-check server status by confirming server-one can accept a web request to the root
-            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(masterAddress) + ":8080").openConnection();
+            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(masterAddress) + ":" + TestSuiteEnvironment.getHttpPort()).openConnection();
             connection.connect();
 
             if (Boolean.getBoolean("expression.audit")) {
@@ -86,7 +86,7 @@ public void testMasterAndSlave() throws Exception {
             masterUtils.start();
             slaveUtils.start();
             // Double-check server status by confirming server-one can accept a web request to the root
-            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(slaveAddress) + ":8080").openConnection();
+            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(slaveAddress) + ":" + TestSuiteEnvironment.getHttpPort()).openConnection();
             connection.connect();
         } finally {
             try {
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeployAllServerGroupsTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeployAllServerGroupsTestCase.java
index 99199d59ea4..d0b88927cdc 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeployAllServerGroupsTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeployAllServerGroupsTestCase.java
@@ -132,7 +132,7 @@ private void checkURL(String path, String content, boolean shouldFail) throws Ex
                 if (! CLITestSuite.serverStatus.get(server)) continue;
                 Integer portOffset = CLITestSuite.portOffsets.get(server);
 
-                URL url = new URL("http", address, 8080 + portOffset, path);
+                URL url = new URL("http", address, Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + portOffset, path);
                 boolean failed = false;
                 try {
                     String response = HttpRequest.get(url.toString(), 10, TimeUnit.SECONDS);
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeploySingleServerGroupTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeploySingleServerGroupTestCase.java
index 083ce13755d..7bb229244ce 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeploySingleServerGroupTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DeploySingleServerGroupTestCase.java
@@ -162,7 +162,7 @@ private void checkURL(String path, String content, String serverGroup, boolean s
                 if (! CLITestSuite.serverStatus.get(server)) continue; // server not started
                 Integer portOffset = CLITestSuite.portOffsets.get(server);
 
-                URL url = new URL("http", address, 8080 + portOffset, path);
+                URL url = new URL("http", address, Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + portOffset, path);
                 boolean failed = false;
                 try {
                     String response = HttpRequest.get(url.toString(), 10, TimeUnit.SECONDS);
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DomainDeployWithRuntimeNameTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DomainDeployWithRuntimeNameTestCase.java
index 6f93e1c76e3..18da0b7c056 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DomainDeployWithRuntimeNameTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/DomainDeployWithRuntimeNameTestCase.java
@@ -159,7 +159,7 @@ private void checkURL(String path, String content, String serverGroup, boolean s
                 if (!CLITestSuite.serverStatus.get(server)) {
                     continue; // server not started
                 }
-                int port = 8080 + CLITestSuite.portOffsets.get(server);
+                int port = Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + CLITestSuite.portOffsets.get(server);
 
                 URL url = new URL("http", address, port, path);
                 boolean failed = false;
diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java
index 557cac459e3..5d374aba520 100644
--- a/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java
+++ b/testsuite/domain/src/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java
@@ -422,7 +422,7 @@ private static String checkURL(String server, boolean shouldFail, String path) t
         String address = CLITestSuite.hostAddresses.get(getServerHost(server));
         Integer portOffset = CLITestSuite.portOffsets.get(server);
 
-        URL url = new URL("http", address, 8080 + portOffset, path);
+        URL url = new URL("http", address, Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + portOffset, path);
         boolean failed = false;
         String response = null;
         try {
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain-minimal.xml b/testsuite/domain/src/test/resources/domain-configs/domain-minimal.xml
index 3d87b540f6f..0913d600e56 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain-minimal.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain-minimal.xml
@@ -86,7 +86,7 @@
             <socket-binding name="txn-status-manager" port="4713"/>
             <socket-binding name="messaging" port="5445" />
             <socket-binding name="messaging-throughput" port="5455"/>
-             <socket-binding name="http" port="8080"/>
+             <socket-binding name="http" port="${jboss.http.port:8080}"/>
              <socket-binding name="https" port="8443"/>
             <outbound-socket-binding name="mail-smtp">
                 <remote-destination host="localhost" port="25"/>
@@ -94,7 +94,7 @@
          </socket-binding-group>
         <socket-binding-group name="other-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain-rbac.xml b/testsuite/domain/src/test/resources/domain-configs/domain-rbac.xml
index 2730ab0674a..8bf874de399 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain-rbac.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain-rbac.xml
@@ -382,7 +382,7 @@
     <socket-binding-groups>
         <socket-binding-group name="sockets-a" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <!-- include socket-binding-group="web-sockets"/-->
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
@@ -392,7 +392,7 @@
         </socket-binding-group>
         <socket-binding-group name="sockets-b" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <!-- include socket-binding-group="web-sockets"/-->
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
@@ -402,7 +402,7 @@
         </socket-binding-group>
         <socket-binding-group name="sockets-shared" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <!-- include socket-binding-group="web-sockets"/-->
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain-respawn.xml b/testsuite/domain/src/test/resources/domain-configs/domain-respawn.xml
index 6d66e8ae3d0..8a753918ad4 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain-respawn.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain-respawn.xml
@@ -79,7 +79,7 @@
 
     <socket-binding-groups>
          <socket-binding-group name="web-sockets" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
          </socket-binding-group>
          <socket-binding-group name="standard-sockets" default-interface="public">
@@ -90,7 +90,7 @@
             <socket-binding name="txn-status-manager" port="4713"/>
             <socket-binding name="messaging" port="5445" />
             <socket-binding name="messaging-throughput" port="5455"/>
-             <socket-binding name="http" port="8080"/>
+             <socket-binding name="http" port="${jboss.http.port:8080}"/>
              <socket-binding name="https" port="8443"/>
             <outbound-socket-binding name="mail-smtp">
                 <remote-destination host="localhost" port="25"/>
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain-standard-ee.xml b/testsuite/domain/src/test/resources/domain-configs/domain-standard-ee.xml
index 976cf8e9502..8ba0822bffd 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain-standard-ee.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain-standard-ee.xml
@@ -615,12 +615,12 @@
 
     <socket-binding-groups>
         <socket-binding-group name="web-sockets" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
         </socket-binding-group>
         <socket-binding-group name="standard-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <!-- include socket-binding-group="web-sockets"/-->
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
@@ -641,7 +641,7 @@
         </socket-binding-group>
         <socket-binding-group name="other-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
@@ -661,7 +661,7 @@
             <!-- include socket-binding-group="standard-sockets"/-->
         </socket-binding-group>
         <socket-binding-group name="ignored" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
         </socket-binding-group>
         <socket-binding-group name="reload-sockets" default-interface="public"/>
     </socket-binding-groups>
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain-standard.xml b/testsuite/domain/src/test/resources/domain-configs/domain-standard.xml
index 484cfc6e41e..8c36a6ffa66 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain-standard.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain-standard.xml
@@ -679,12 +679,12 @@
 
     <socket-binding-groups>
         <socket-binding-group name="web-sockets" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
         </socket-binding-group>
         <socket-binding-group name="standard-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <!-- include socket-binding-group="web-sockets"/-->
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
@@ -705,7 +705,7 @@
         </socket-binding-group>
         <socket-binding-group name="other-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
@@ -725,7 +725,7 @@
             <!-- include socket-binding-group="standard-sockets"/-->
         </socket-binding-group>
         <socket-binding-group name="ignored" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
         </socket-binding-group>
         <socket-binding-group name="reload-sockets" default-interface="public"/>
     </socket-binding-groups>
diff --git a/testsuite/domain/src/test/resources/domain-configs/domain.cached-remote.xml b/testsuite/domain/src/test/resources/domain-configs/domain.cached-remote.xml
index 85e399e0eac..2e180662b63 100644
--- a/testsuite/domain/src/test/resources/domain-configs/domain.cached-remote.xml
+++ b/testsuite/domain/src/test/resources/domain-configs/domain.cached-remote.xml
@@ -72,7 +72,7 @@
 
     <socket-binding-groups>
         <socket-binding-group name="standard-sockets" default-interface="public">
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
         </socket-binding-group>
     </socket-binding-groups>
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/deployment/structure/war/symbolicLink/SymlinkingUnitTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/deployment/structure/war/symbolicLink/SymlinkingUnitTestCase.java
index 76ca9842937..1beadc5de8d 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/deployment/structure/war/symbolicLink/SymlinkingUnitTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/deployment/structure/war/symbolicLink/SymlinkingUnitTestCase.java
@@ -156,7 +156,7 @@ private void setup(boolean symlinkingEnabled) throws IOException {
     private int getURLcode(String htmlPage) {
         int code = 0;
         try {
-            String url = "http://" + TestSuiteEnvironment.getServerAddress() + ":8080/explodedDeployment/"
+            String url = "http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/explodedDeployment/"
                     + htmlPage + ".html";
             logger.infof("%s is the built URL.", url);
             HttpURLConnection urlConnection = (HttpURLConnection) new URL(url).openConnection();
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/EJBUtil.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/EJBUtil.java
index 97c0823f9d1..b1e3f702d99 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/EJBUtil.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/EJBUtil.java
@@ -104,7 +104,7 @@ public static Properties createEjbClientConfiguration(String hostName, String us
         pr.put("remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED", "false");
         pr.put("remote.connections", "default");
         pr.put("remote.connection.default.host", hostName);
-        pr.put("remote.connection.default.port", "8080");
+        pr.put("remote.connection.default.port", System.getProperty("jboss.http.port", "8080"));
         pr.put("remote.connection.default.username", username);
         return pr;
     }
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/api/EJBUtil.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/api/EJBUtil.java
index 0188608fe2b..b7954942a19 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/api/EJBUtil.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/container/interceptor/security/api/EJBUtil.java
@@ -107,7 +107,7 @@ public static Properties createEjbClientConfiguration(String hostName, String us
         pr.put("remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED", "false");
         pr.put("remote.connections", "default");
         pr.put("remote.connection.default.host", hostName);
-        pr.put("remote.connection.default.port", "8080");
+        pr.put("remote.connection.default.port", System.getProperty("jboss.http.port", "8080"));
         pr.put("remote.connection.default.username", userName);
         return pr;
     }
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mapbased/MapBasedInitialContextEjbClientTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mapbased/MapBasedInitialContextEjbClientTestCase.java
index 0a38c5bf93e..7bbd452f9a8 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mapbased/MapBasedInitialContextEjbClientTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mapbased/MapBasedInitialContextEjbClientTestCase.java
@@ -63,7 +63,7 @@
      */
     @Test
     public void testScopedEJBClientContexts() throws Exception {
-        InitialContext ctx = new InitialContext(getEjbClientProperties(System.getProperty("node0", "127.0.0.1"), 8080));
+        InitialContext ctx = new InitialContext(getEjbClientProperties(System.getProperty("node0", "127.0.0.1"), Integer.parseInt(System.getProperty("jboss.http.port", "8080"))));
         try {
             String lookupName = "ejb:/" + ARCHIVE_NAME + "/" + StatelessBean.class.getSimpleName() + "!" + StatelessIface.class.getCanonicalName();
             StatelessIface beanStateless = (StatelessIface) ctx.lookup(lookupName);
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java
index 4c58ce4aad0..64238e07b32 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java
@@ -250,7 +250,7 @@ private static InitialContext getInitialContext() throws NamingException {
         final Hashtable env = new Hashtable();
         env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         env.put(Context.INITIAL_CONTEXT_FACTORY, org.jboss.naming.remote.client.InitialContextFactory.class.getName());
-        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + 8080);
+        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
         return new InitialContext(env);
     }
 }
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/client/api/interceptor/annotation/ClientInterceptorsEJBAnnotationTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/client/api/interceptor/annotation/ClientInterceptorsEJBAnnotationTestCase.java
index 5b030c23b38..7a9d722308a 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/client/api/interceptor/annotation/ClientInterceptorsEJBAnnotationTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/client/api/interceptor/annotation/ClientInterceptorsEJBAnnotationTestCase.java
@@ -63,7 +63,7 @@ public void check() throws NamingException {
         properties.put(Context.INITIAL_CONTEXT_FACTORY, WildFlyInitialContextFactory.class.getName());
         properties.put(Context.PROVIDER_URL, "remote+http://" +
                 NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost"))
-                + ":8080");
+                + ":" + System.getProperty("jboss.http.port", "8080"));
         final InitialContext ejbCtx = new InitialContext(properties);
         try {
             SLSBReturningContextDataRemote bean = (SLSBReturningContextDataRemote)ejbCtx.lookup(
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/invocationtimeout/EJBClientInvocationTimeoutTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/invocationtimeout/EJBClientInvocationTimeoutTestCase.java
index 93dbee7b136..e187edfbc78 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/invocationtimeout/EJBClientInvocationTimeoutTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/invocationtimeout/EJBClientInvocationTimeoutTestCase.java
@@ -58,7 +58,7 @@
     private static final String MODULE_NAME = "ejb-client-invocation-timeout";
 
     final String INVOCATION_URL = "remote+http://" +
-            NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost")) + ":8080";
+            NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost")) + ":" + System.getProperty("jboss.http.port", "8080");
 
     @Deployment(testable = false)
     public static Archive createDeployment() {
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/security/EJBUtil.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/security/EJBUtil.java
index e89415e5a1a..bc2e2008564 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/security/EJBUtil.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/remote/security/EJBUtil.java
@@ -89,7 +89,7 @@ public static Properties createEjbClientConfiguration(String hostName) throws Un
         pr.put("remote.connection.default.connect.options.org.xnio.Options.SASL_DISALLOWED_MECHANISMS", "JBOSS-LOCAL-USER");
         pr.put("remote.connections", "default");
         pr.put("remote.connection.default.host", hostName);
-        pr.put("remote.connection.default.port", "8080");
+        pr.put("remote.connection.default.port", System.getProperty("jboss.http.port", "8080"));
         pr.put("remote.connection.default.username", CONNECTION_USERNAME);
         pr.put("remote.connection.default.password", CONNECTION_PASSWORD);
         return pr;
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/security/RunAsPrincipalCustomDomainTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/security/RunAsPrincipalCustomDomainTestCase.java
index 76de98e78a0..e843d4b0eb2 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/security/RunAsPrincipalCustomDomainTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/security/RunAsPrincipalCustomDomainTestCase.java
@@ -101,7 +101,7 @@ public void test() throws Exception {
         String caller = AuthenticationContext.empty()
                 .with(MatchRule.ALL,
                         AuthenticationConfiguration.empty().useName("guest").usePassword("guest").useRealm("ApplicationRealm")
-                                .useHost(Utils.getDefaultHost(false)).usePort(8080)
+                                .useHost(Utils.getDefaultHost(false)).usePort(Integer.parseInt(System.getProperty("jboss.http.port", "8080")))
                                 .setSaslMechanismSelector(SaslMechanismSelector.fromString("DIGEST-MD5")))
                 .runCallable(callable);
         assertEquals("Unexpected principal name returned", "principalFromEntryBean", caller);
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/stateful/exception/ExceptionEjbClientTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/stateful/exception/ExceptionEjbClientTestCase.java
index ee91fa3feb2..b89502becb2 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/stateful/exception/ExceptionEjbClientTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/stateful/exception/ExceptionEjbClientTestCase.java
@@ -49,7 +49,7 @@
     public static void beforeClass() throws Exception {
         final Properties props = new Properties();
         props.put(Context.INITIAL_CONTEXT_FACTORY, WildFlyInitialContextFactory.class.getName());
-        props.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + 8080);
+        props.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
         context = new InitialContext(props);
     }
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/duplicateid/DuplicateIDIntegrationTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/duplicateid/DuplicateIDIntegrationTestCase.java
index 6d54a48e9a6..e6e273e57de 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/duplicateid/DuplicateIDIntegrationTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jsf/duplicateid/DuplicateIDIntegrationTestCase.java
@@ -65,7 +65,7 @@
             COMPONENTS = "components",
             RESOURCES = "resources";
 
-    private static final int APPLICATION_PORT = 8080;
+    private static final int APPLICATION_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
 
     @Deployment(testable = false, name = APP_NAME)
     public static Archive<?> deploy() {
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/ServletRuntimeNameTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/ServletRuntimeNameTestCase.java
index ab58c923e7c..d24e1000a56 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/ServletRuntimeNameTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/ServletRuntimeNameTestCase.java
@@ -155,7 +155,7 @@ public void testRecursive() throws Exception {
 
     @Test
     public void testServletCall() throws Exception {
-        String url = "http://" + TestSuiteEnvironment.getServerAddress() + ":8080/"+SUB_DEPLOYMENT_MODULE_NAME+Servlet.URL_PATTERN;
+        String url = "http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/"+SUB_DEPLOYMENT_MODULE_NAME+Servlet.URL_PATTERN;
         String res = HttpRequest.get(url, 2, TimeUnit.SECONDS);
         Assert.assertEquals(Servlet.SUCCESS, res);
     }
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatefulEJBRemoteHomeRuntimeNameTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatefulEJBRemoteHomeRuntimeNameTestCase.java
index c8c19d194b2..0fb3475c413 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatefulEJBRemoteHomeRuntimeNameTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatefulEJBRemoteHomeRuntimeNameTestCase.java
@@ -101,7 +101,7 @@ private static InitialContext getInitialContext() throws NamingException {
         final Hashtable env = new Hashtable();
         env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         env.put(Context.INITIAL_CONTEXT_FACTORY, org.jboss.naming.remote.client.InitialContextFactory.class.getName());
-        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + 8080);
+        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
         return new InitialContext(env);
     }
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatelessEJBRemoteHomeRuntimeNameTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatelessEJBRemoteHomeRuntimeNameTestCase.java
index ba27992f319..b696a920947 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatelessEJBRemoteHomeRuntimeNameTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/StatelessEJBRemoteHomeRuntimeNameTestCase.java
@@ -100,7 +100,7 @@ private static InitialContext getInitialContext() throws NamingException {
         final Hashtable env = new Hashtable();
         env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         env.put(Context.INITIAL_CONTEXT_FACTORY, org.jboss.naming.remote.client.InitialContextFactory.class.getName());
-        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + 8080);
+        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
         return new InitialContext(env);
     }
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/TimerEJBRuntimeNameTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/TimerEJBRuntimeNameTestCase.java
index 0fd2283d181..9df5166d2d6 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/TimerEJBRuntimeNameTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/deploy/runtime/TimerEJBRuntimeNameTestCase.java
@@ -159,7 +159,7 @@ private static InitialContext getInitialContext() throws NamingException {
         final Hashtable env = new Hashtable();
         env.put(Context.URL_PKG_PREFIXES, "org.jboss.ejb.client.naming");
         env.put(Context.INITIAL_CONTEXT_FACTORY, org.jboss.naming.remote.client.InitialContextFactory.class.getName());
-        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + 8080);
+        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
         return new InitialContext(env);
     }
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java
index d3cce8afc36..101b88e2d7f 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/messaging/mgmt/CoreQueueManagementTestCase.java
@@ -80,7 +80,7 @@ public void setup() throws Exception {
 
         HashMap<String, Object> map = new HashMap<String, Object>();
         map.put("host", TestSuiteEnvironment.getServerAddress());
-        map.put("port", 8080);
+        map.put("port", TestSuiteEnvironment.getHttpPort());
         map.put(TransportConstants.HTTP_UPGRADE_ENABLED_PROP_NAME, true);
         map.put(TransportConstants.HTTP_UPGRADE_ENDPOINT_PROP_NAME, "http-acceptor");
         TransportConfiguration transportConfiguration =
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/CallEjbServlet.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/CallEjbServlet.java
index 571f57c47ad..74c800df7f5 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/CallEjbServlet.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/CallEjbServlet.java
@@ -28,7 +28,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
             String address = System.getProperty("node0", "localhost");
             // format possible IPv6 address
             address = NetworkUtils.formatPossibleIpv6Address(address);
-            env.put(Context.PROVIDER_URL, "remote+http://" + address + ":8080");
+            env.put(Context.PROVIDER_URL, "remote+http://" + address + ":" + System.getProperty("jboss.http.port", "8080"));
             env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
             ctx = new InitialContext(env);
 
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/MyEjbBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/MyEjbBean.java
index fb6141b4ee1..857997c83f2 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/MyEjbBean.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/MyEjbBean.java
@@ -17,7 +17,7 @@ protected MyObject lookup() {
             String address = System.getProperty("node0", "localhost");
             // format possible IPv6 address
             address = NetworkUtils.formatPossibleIpv6Address(address);
-            env.put(Context.PROVIDER_URL, "http-remoting://" + address + ":8080");
+            env.put(Context.PROVIDER_URL, "http-remoting://" + address + ":" + System.getProperty("jboss.http.port", "8080"));
             env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
             Context ctx = new InitialContext(env);
             try {
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/RunRmiServlet.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/RunRmiServlet.java
index b2a962ffec3..c71d00e63a6 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/RunRmiServlet.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/remote/multiple/RunRmiServlet.java
@@ -37,7 +37,7 @@ protected MyObject lookup() throws ServletException {
             String address = System.getProperty("node0", "localhost");
             // format possible IPv6 address
             address = NetworkUtils.formatPossibleIpv6Address(address);
-            env.put(Context.PROVIDER_URL, "remote+http://" + address + ":8080");
+            env.put(Context.PROVIDER_URL, "remote+http://" + address + ":" + System.getProperty("jboss.http.port", "8080"));
             env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
             Context ctx = new InitialContext(env);
             try {
diff --git a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/web/VirtualHostTestCase.java b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/web/VirtualHostTestCase.java
index 859f0fe275e..10c7f5c7ac8 100644
--- a/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/web/VirtualHostTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/wildfly/test/integration/web/VirtualHostTestCase.java
@@ -138,12 +138,12 @@ private void callAndTest(String uri, String expectedResult) throws IOException {
     public void testDefaultHost() throws IOException {
         Assume.assumeTrue("This needs to be localhost, as it is by host mapping",
                 InetAddress.getByName(TestSuiteEnvironment.getServerAddress()).isLoopbackAddress());
-        callAndTest("http://localhost:8080/", "ROOT");
+        callAndTest("http://localhost:" + TestSuiteEnvironment.getHttpPort() + "/", "ROOT");
     }
 
     @Test
     public void testNonDefaultHost() throws IOException {
-        callAndTest("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/", "test"); //second host on first server has alias 127.0.0.1 or ::1
+        callAndTest("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/", "test"); //second host on first server has alias 127.0.0.1 or ::1
     }
 
     @Test
diff --git a/testsuite/integration/basic/src/test/resources/jboss-ejb-client.properties b/testsuite/integration/basic/src/test/resources/jboss-ejb-client.properties
index ad2ef5974a1..b89457a6b3b 100644
--- a/testsuite/integration/basic/src/test/resources/jboss-ejb-client.properties
+++ b/testsuite/integration/basic/src/test/resources/jboss-ejb-client.properties
@@ -24,7 +24,7 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/basic/src/test/resources/org/jboss/as/test/integration/ejb/security/jboss-ejb-client.properties b/testsuite/integration/basic/src/test/resources/org/jboss/as/test/integration/ejb/security/jboss-ejb-client.properties
index 183f8b09f30..434e990c1cd 100644
--- a/testsuite/integration/basic/src/test/resources/org/jboss/as/test/integration/ejb/security/jboss-ejb-client.properties
+++ b/testsuite/integration/basic/src/test/resources/org/jboss/as/test/integration/ejb/security/jboss-ejb-client.properties
@@ -1,6 +1,6 @@
 remote.connections=default
 endpoint.name=client-endpoint
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.host=${node0:localhost}
 remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 
diff --git a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jms/ClusteredMessagingTestCase.java b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jms/ClusteredMessagingTestCase.java
index 44b45c4991f..b591f282563 100644
--- a/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jms/ClusteredMessagingTestCase.java
+++ b/testsuite/integration/clustering/src/test/java/org/jboss/as/test/clustering/cluster/jms/ClusteredMessagingTestCase.java
@@ -172,7 +172,7 @@ public void testClusteredTopic() throws Exception {
     protected static InitialContext createJNDIContextFromServer0() throws NamingException {
         final Properties env = new Properties();
         env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":8080");
+        env.put(Context.PROVIDER_URL, "remote+http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort());
         env.put(Context.SECURITY_PRINCIPAL, "guest");
         env.put(Context.SECURITY_CREDENTIALS, "guest");
         return new InitialContext(env);
diff --git a/testsuite/integration/clustering/src/test/resources/wildfly-config.xml b/testsuite/integration/clustering/src/test/resources/wildfly-config.xml
index 11278024e04..fd6ec2df2bc 100644
--- a/testsuite/integration/clustering/src/test/resources/wildfly-config.xml
+++ b/testsuite/integration/clustering/src/test/resources/wildfly-config.xml
@@ -2,7 +2,7 @@
 <configuration>
     <jboss-ejb-client xmlns="urn:jboss:wildfly-client-ejb:3.0">
         <connections>
-            <connection uri="remote+http://${node0.escaped:localhost}:8080"/>
+            <connection uri="remote+http://${node0.escaped:localhost}:${jboss.http.port:8080}"/>
             <!-- node1 should be auto-discovered -->
         </connections>
     </jboss-ejb-client>
diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java
index 20c6e583592..83a573d69aa 100644
--- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java
+++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java
@@ -82,7 +82,7 @@
     @Before
     public void startUp() throws NamingException {
         if(checker == null) {
-            checker = TransactionTestLookupUtil.lookupEjbStateless(mgmtClient.getMgmtAddress(), 8080,
+            checker = TransactionTestLookupUtil.lookupEjbStateless(mgmtClient.getMgmtAddress(), Integer.parseInt(System.getProperty("jboss.http.port", "8080")),
                     DEPLOYMENT_NAME, TransactionCheckerSingleton.class, TransactionCheckerSingletonRemote.class);
         }
         checker.resetAll();
diff --git a/testsuite/integration/legacy-ejb-client/src/test/resources/jboss-ejb-client.properties b/testsuite/integration/legacy-ejb-client/src/test/resources/jboss-ejb-client.properties
index ad2ef5974a1..b89457a6b3b 100644
--- a/testsuite/integration/legacy-ejb-client/src/test/resources/jboss-ejb-client.properties
+++ b/testsuite/integration/legacy-ejb-client/src/test/resources/jboss-ejb-client.properties
@@ -24,7 +24,7 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/security/ElytronRemoteOutboundConnectionTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/security/ElytronRemoteOutboundConnectionTestCase.java
index 7d85501efc3..858d8cfd067 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/security/ElytronRemoteOutboundConnectionTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/security/ElytronRemoteOutboundConnectionTestCase.java
@@ -151,7 +151,7 @@
     private static final String BARE_REMOTING_PROTOCOL = "remote";
     private static final int SSL_REMOTING_PORT = 54448;
     private static final String SSL_REMOTING_PROTOCOL = "remote";
-    private static final int HTTP_REMOTING_PORT = 8080;
+    private static final int HTTP_REMOTING_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
     private static final String HTTP_REMOTING_PROTOCOL = "http-remoting";
     private static final int HTTPS_REMOTING_PORT = 8443;
     private static final String HTTPS_REMOTING_PROTOCOL = "https-remoting";
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/reconnect/jboss-ejb-client.properties b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/reconnect/jboss-ejb-client.properties
index 2bef3d56f24..a76dbf0ab53 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/reconnect/jboss-ejb-client.properties
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/reconnect/jboss-ejb-client.properties
@@ -24,6 +24,6 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/jca/workmanager/distributed/AbstractDwmTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/jca/workmanager/distributed/AbstractDwmTestCase.java
index 7403bb1c4d2..2963ac468e8 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/jca/workmanager/distributed/AbstractDwmTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/jca/workmanager/distributed/AbstractDwmTestCase.java
@@ -222,7 +222,7 @@ public void setUp() throws Exception {
 
         // set up ejb proxies
         try {
-            server1Proxy = lookupAdminObject(TestSuiteEnvironment.getServerAddress(), "8080");
+            server1Proxy = lookupAdminObject(TestSuiteEnvironment.getServerAddress(), System.getProperty("jboss.http.port", "8080"));
             server2Proxy = lookupAdminObject(TestSuiteEnvironment.getServerAddressNode1(), "8180");
             Assert.assertNotNull(server1Proxy);
             Assert.assertNotNull(server2Proxy);
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/layered/LayeredDistributionTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/layered/LayeredDistributionTestCase.java
index ca25b295926..cbb6c820454 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/layered/LayeredDistributionTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/layered/LayeredDistributionTestCase.java
@@ -74,7 +74,7 @@
     private static final String PRODUCT_NAME = "Test-Product";
     private static final String PRODUCT_VERSION = "1.0.0-Test";
     private static final String DEPLOYMENT = "test-deployment";
-    private static final String webURI = "http://" + TestSuiteEnvironment.getServerAddress() + ":8080";
+    private static final String webURI = "http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort();
 
     @ArquillianResource
     private ContainerController controller;
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ha/AbstractMessagingHATestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ha/AbstractMessagingHATestCase.java
index 3d63e74dd40..d97147c9fa9 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ha/AbstractMessagingHATestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ha/AbstractMessagingHATestCase.java
@@ -151,7 +151,7 @@ protected static void checkHornetQServerStartedAndActiveAttributes(JMSOperations
     protected static InitialContext createJNDIContextFromServer1() throws NamingException {
         final Properties env = new Properties();
         env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
-        env.put(Context.PROVIDER_URL, System.getProperty(Context.PROVIDER_URL, "remote+http://127.0.0.1:8080"));
+        env.put(Context.PROVIDER_URL, System.getProperty(Context.PROVIDER_URL, "remote+http://127.0.0.1:" + TestSuiteEnvironment.getHttpPort()));
         env.put(Context.SECURITY_PRINCIPAL, "guest");
         env.put(Context.SECURITY_CREDENTIALS, "guest");
         return new InitialContext(env);
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/SecuredDataSourceTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/SecuredDataSourceTestCase.java
index 70a5c03670a..0d013a43824 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/SecuredDataSourceTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/SecuredDataSourceTestCase.java
@@ -81,7 +81,7 @@
 
     @Test
     public void test() throws Exception {
-        final URI uri = new URI("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/" + TEST_NAME
+        final URI uri = new URI("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/" + TEST_NAME
                 + DataSourceTestServlet.SERVLET_PATH + "?" + DataSourceTestServlet.PARAM_DS + "=" + TEST_NAME);
         final String body = Utils.makeCall(uri, HttpServletResponse.SC_OK);
         assertEquals("true", body);
diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/VaultSystemPropertyOnServerStartTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/VaultSystemPropertyOnServerStartTestCase.java
index c347a97ab24..711849ee01b 100644
--- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/VaultSystemPropertyOnServerStartTestCase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/security/VaultSystemPropertyOnServerStartTestCase.java
@@ -79,7 +79,7 @@
     public static final String TESTING_SYSTEM_PROPERTY = "vault.testing.property";
     public static final PathAddress SYSTEM_PROPERTIES_PATH = PathAddress.pathAddress().append(SYSTEM_PROPERTY,
             TESTING_SYSTEM_PROPERTY);
-    private static final String printPropertyServlet = "http://" + TestSuiteEnvironment.getServerAddress() + ":8080/"
+    private static final String printPropertyServlet = "http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/"
             + DEPLOYMENT + PrintSystemPropertyServlet.SERVLET_PATH + "?" + PrintSystemPropertyServlet.PARAM_PROPERTY_NAME + "="
             + TESTING_SYSTEM_PROPERTY;
 
diff --git a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java
index 3204c06384c..3dc92616f82 100644
--- a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java
+++ b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java
@@ -653,7 +653,7 @@ public int getManagementPort() {
         }
 
         public int getApplicationPort() {
-            return 8080 + portOffset;
+            return Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + portOffset;
         }
 
         public String getApplicationHttpUrl() throws IOException {
diff --git a/testsuite/integration/manualmode/src/test/resources/jboss-ejb-client.properties b/testsuite/integration/manualmode/src/test/resources/jboss-ejb-client.properties
index 2bef3d56f24..a76dbf0ab53 100644
--- a/testsuite/integration/manualmode/src/test/resources/jboss-ejb-client.properties
+++ b/testsuite/integration/manualmode/src/test/resources/jboss-ejb-client.properties
@@ -24,6 +24,6 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml
index 246c65f6e64..976a6d453d1 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-1-3.xml
@@ -1230,7 +1230,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1242,7 +1242,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1260,7 +1260,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1277,7 +1277,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml
index 90c8d77174c..00bb01aedc8 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/7-2-0.xml
@@ -1268,7 +1268,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1280,7 +1280,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1298,7 +1298,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1315,7 +1315,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml
index 9433e989ac7..a2cc787ad1a 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-0-0.xml
@@ -1219,7 +1219,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1231,7 +1231,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1249,7 +1249,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1266,7 +1266,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml
index a487f5ae08d..707ddcf8023 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-1-0.xml
@@ -1266,7 +1266,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1278,7 +1278,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1296,7 +1296,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1313,7 +1313,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml
index f9307fadc53..aec95bf04c3 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-2-0.xml
@@ -1279,7 +1279,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1291,7 +1291,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1309,7 +1309,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1326,7 +1326,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml
index 50a73a15cfb..6e791ff67e4 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-3-0.xml
@@ -1320,7 +1320,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1332,7 +1332,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1350,7 +1350,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1367,7 +1367,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml
index 533cfe82d41..3f157e709e8 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/domain/eap-6-4-0.xml
@@ -1328,7 +1328,7 @@
         <socket-binding-group name="standard-sockets" default-interface="public">
             <!-- Needed for server groups using the 'default' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="remoting" port="4447"/>
             <socket-binding name="txn-recovery-environment" port="4712"/>
@@ -1340,7 +1340,7 @@
         <socket-binding-group name="ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
             <socket-binding name="jgroups-tcp" port="7600"/>
@@ -1358,7 +1358,7 @@
         <socket-binding-group name="full-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
@@ -1375,7 +1375,7 @@
         <socket-binding-group name="full-ha-sockets" default-interface="public">
             <!-- Needed for server groups using the 'full-ha' profile  -->
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jacorb" interface="unsecure" port="3528"/>
             <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full-ha.xml
index 1c27c78ec42..e208951f8d3 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full-ha.xml
@@ -475,7 +475,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full.xml
index 8c8b4e2c568..becbb37feea 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-full.xml
@@ -371,7 +371,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-ha.xml
index 8a4baeac43c..12c89b27c14 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-ha.xml
@@ -364,7 +364,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-hornetq-colocated.xml
index 3faff59e54f..cdcf194c37c 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-hornetq-colocated.xml
@@ -432,7 +432,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-jts.xml
index cca0030f2b8..d5c6255cf68 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-jts.xml
@@ -290,7 +290,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-xts.xml
index c087e8b02f3..5398b9256e0 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3-xts.xml
@@ -351,7 +351,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -375,7 +375,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3.xml
index 9e4dfb787b3..4e260334b24 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-1-3.xml
@@ -283,7 +283,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full-ha.xml
index f58357bc915..ed6c4c82590 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full-ha.xml
@@ -479,7 +479,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full.xml
index 4485edfdf70..f1a93ed9e0e 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-full.xml
@@ -383,7 +383,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-ha.xml
index 89c215f6902..14e785cfe19 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-ha.xml
@@ -369,7 +369,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-hornetq-colocated.xml
index 605eff4f4d3..919c78e9694 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-hornetq-colocated.xml
@@ -444,7 +444,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-jts.xml
index 443616c76cc..0b13738c8ca 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-jts.xml
@@ -304,7 +304,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-xts.xml
index c52d2576714..6f60108f612 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0-xts.xml
@@ -365,7 +365,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -389,7 +389,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0.xml
index cef6ac7a210..f1ab897f3c6 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/7-2-0.xml
@@ -295,7 +295,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full-ha.xml
index 5fdec462659..1ff7bfc82af 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full-ha.xml
@@ -467,7 +467,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full.xml
index 27d0c682b0e..0ce805cd544 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-full.xml
@@ -371,7 +371,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-ha.xml
index 3cb7551d3f8..2d923ca349f 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-ha.xml
@@ -364,7 +364,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-hornetq-colocated.xml
index ff1bca98a01..61a0a5c50d1 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-hornetq-colocated.xml
@@ -432,7 +432,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-jts.xml
index b89a6f9ee75..fead84acf71 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-jts.xml
@@ -290,7 +290,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-xts.xml
index e4409666116..c69387759bf 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0-xts.xml
@@ -351,7 +351,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -375,7 +375,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0.xml
index e900c64566f..18fd7e36746 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-0-0.xml
@@ -283,7 +283,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full-ha.xml
index a32b43f2a2b..4a3d6568fa5 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full-ha.xml
@@ -477,7 +477,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full.xml
index 101f9a588d2..3c0ee981f85 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-full.xml
@@ -383,7 +383,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-ha.xml
index c3f57efa996..ca2fda0a798 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-ha.xml
@@ -369,7 +369,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-hornetq-colocated.xml
index 23a693ec334..1b680abe0a9 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-hornetq-colocated.xml
@@ -444,7 +444,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-jts.xml
index c703aaa94dc..ae1aa5e310c 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-jts.xml
@@ -304,7 +304,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-xts.xml
index 10f133d2049..c877c0b77e1 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0-xts.xml
@@ -365,7 +365,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -389,7 +389,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0.xml
index f04154501a5..a5b6ac7079b 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-1-0.xml
@@ -295,7 +295,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full-ha.xml
index 183e8ce6868..f9d122134f4 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full-ha.xml
@@ -503,7 +503,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full.xml
index 1fd2ff67954..20f1e2d6613 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-full.xml
@@ -409,7 +409,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-ha.xml
index f5f8ff24869..7460e1a66d5 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-ha.xml
@@ -394,7 +394,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-hornetq-colocated.xml
index b12ecfcec0e..fed0c2b0928 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-hornetq-colocated.xml
@@ -469,7 +469,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-jts.xml
index 4767c901ed8..7568e7c3a42 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-jts.xml
@@ -329,7 +329,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-xts.xml
index f32e5bebd59..5cf52e585a9 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0-xts.xml
@@ -391,7 +391,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -415,7 +415,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0.xml
index 21f6081cdb6..03b05f27db0 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-2-0.xml
@@ -320,7 +320,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full-ha.xml
index 6065d65248e..b03c9613632 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full-ha.xml
@@ -515,7 +515,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full.xml
index d312c9a3635..a944bf812d1 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-full.xml
@@ -424,7 +424,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-ha.xml
index bb8f857eae1..b67dcb7d87c 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-ha.xml
@@ -401,7 +401,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-hornetq-colocated.xml
index d367a55cf95..7a83771c3ad 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-hornetq-colocated.xml
@@ -476,7 +476,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-jts.xml
index 453dd1cfdb9..a50618b0dce 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-jts.xml
@@ -336,7 +336,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-picketlink.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-picketlink.xml
index 4dc9754d544..c7fb790dd77 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-picketlink.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-picketlink.xml
@@ -348,67 +348,67 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:picketlink-federation:1.0">
             <federation name="federation-simple-redirect-binding">
-                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
+                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect1/" post-binding="false" support-signatures="false"/>
-                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect2/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect1/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect2/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
             <federation name="federation-redirect-with-signatures">
                 <key-store file="/jbid_test_keystore.jks" password="store123" sign-key-alias="servercert" sign-key-password="test123"/>
-                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
+                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}" cert-alias="servercert"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
-                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-simple-post-binding">
-                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post/" security-domain="idp">
+                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post/" security-domain="idp">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post1/"/>
-                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post2/"/>
+                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post1/"/>
+                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post2/"/>
                 </service-providers>
             </federation>
             <federation name="federation-post-with-signatures">
                 <key-store file="/jbid_test_keystore.jks" password="store123" sign-key-alias="servercert" sign-key-password="test123"/>
-                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post-sig/" security-domain="idp" support-signatures="true">
+                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post-sig/" security-domain="idp" support-signatures="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}" cert-alias="servercert"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig1/" support-signatures="true"/>
-                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig2/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig1/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig2/" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-metadata">
                 <key-store file="/jbid_test_keystore.jks" password="store123" sign-key-alias="servercert" sign-key-password="test123"/>
-                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
+                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}" cert-alias="servercert"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata1/" support-signatures="true" support-metadata="true"/>
-                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata2/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata1/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata2/" support-signatures="true" support-metadata="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-external-idp">
                 <identity-provider name="idp-external" url="http://idp.external.com/" external="true"/>
                 <service-providers>
-                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sales-on-external/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sales-on-external/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
         </subsystem>
@@ -623,7 +623,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-xts.xml
index 31fe72480a1..492a6e18f0e 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0-xts.xml
@@ -404,7 +404,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -428,7 +428,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0.xml
index 9225337d0e8..cbefc3907cb 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-3-0.xml
@@ -327,7 +327,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full-ha.xml
index 92471177f11..aae8e20570a 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full-ha.xml
@@ -517,7 +517,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full.xml
index 00beee12f56..5d5e0512775 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-full.xml
@@ -426,7 +426,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-ha.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-ha.xml
index 56e1754354c..7475425e749 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-ha.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-ha.xml
@@ -403,7 +403,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jgroups-mping" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/>
         <socket-binding name="jgroups-tcp" port="7600"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-hornetq-colocated.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-hornetq-colocated.xml
index 8ec2da8e341..da6ca91ea40 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-hornetq-colocated.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-hornetq-colocated.xml
@@ -478,7 +478,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-jts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-jts.xml
index ede1e8bfa48..3e702abf9d3 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-jts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-jts.xml
@@ -338,7 +338,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-picketlink.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-picketlink.xml
index 26da8c7b218..12579248e6c 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-picketlink.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-picketlink.xml
@@ -350,14 +350,14 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:picketlink-federation:1.1">
             <federation name="federation-simple-redirect-binding">
-                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
+                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect1/" post-binding="false" support-signatures="false"/>
-                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect2/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect1/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect2/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
             <federation name="federation-redirect-with-signatures">
@@ -366,25 +366,25 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
+                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
-                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-simple-post-binding">
-                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post/" security-domain="idp">
+                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post/" security-domain="idp">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post1/"/>
-                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post2/"/>
+                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post1/"/>
+                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post2/"/>
                 </service-providers>
             </federation>
             <federation name="federation-post-with-signatures">
@@ -393,14 +393,14 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post-sig/" security-domain="idp" support-signatures="true">
+                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post-sig/" security-domain="idp" support-signatures="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig1/" support-signatures="true"/>
-                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig2/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig1/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig2/" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-metadata">
@@ -409,20 +409,20 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
+                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata1/" support-signatures="true" support-metadata="true"/>
-                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata2/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata1/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata2/" support-signatures="true" support-metadata="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-external-idp">
                 <identity-provider name="idp-external" url="http://idp.external.com/" external="true"/>
                 <service-providers>
-                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sales-on-external/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sales-on-external/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
         </subsystem>
@@ -650,7 +650,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-xts.xml
index d31e5a296d3..305132eda6e 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0-xts.xml
@@ -406,7 +406,7 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:1.0">
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
         </subsystem>
     </profile>
     <interfaces>
@@ -430,7 +430,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jacorb" interface="unsecure" port="3528"/>
         <socket-binding name="jacorb-ssl" interface="unsecure" port="3529"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0.xml
index fb2773c00ca..79228919b66 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-6-4-0.xml
@@ -329,7 +329,7 @@
         <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
         <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9443}"/>
         <socket-binding name="ajp" port="8009"/>
-        <socket-binding name="http" port="8080"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="remoting" port="4447"/>
         <socket-binding name="txn-recovery-environment" port="4712"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-picketlink.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-picketlink.xml
index 3de7f417ebe..9f256085648 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-picketlink.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-picketlink.xml
@@ -319,14 +319,14 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:picketlink-federation:2.0">
             <federation name="federation-simple-redirect-binding">
-                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
+                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect1/" post-binding="false" support-signatures="false"/>
-                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect2/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect1/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect2/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
             <federation name="federation-redirect-with-signatures">
@@ -335,25 +335,25 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
+                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
-                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-simple-post-binding">
-                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post/" security-domain="idp">
+                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post/" security-domain="idp">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post1/"/>
-                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post2/"/>
+                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post1/"/>
+                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post2/"/>
                 </service-providers>
             </federation>
             <federation name="federation-post-with-signatures">
@@ -362,14 +362,14 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post-sig/" security-domain="idp" support-signatures="true">
+                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post-sig/" security-domain="idp" support-signatures="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig1/" support-signatures="true"/>
-                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig2/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig1/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig2/" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-metadata">
@@ -378,20 +378,20 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
+                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata1/" support-signatures="true" support-metadata="true"/>
-                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata2/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata1/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata2/" support-signatures="true" support-metadata="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-external-idp">
                 <identity-provider name="idp-external" url="http://idp.external.com/" external="true"/>
                 <service-providers>
-                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sales-on-external/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sales-on-external/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
         </subsystem>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-xts.xml
index c2e95ee520d..9838efe7600 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-0-0-xts.xml
@@ -407,7 +407,7 @@
         <subsystem xmlns="urn:jboss:domain:weld:3.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:2.0">
             <host name="default-host"/>
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
             <default-context-propagation enabled="true"/>
         </subsystem>
     </profile>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-picketlink.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-picketlink.xml
index 8e95dd60c5d..fd83f9c21c4 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-picketlink.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-picketlink.xml
@@ -327,14 +327,14 @@
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:picketlink-federation:2.0">
             <federation name="federation-simple-redirect-binding">
-                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
+                <identity-provider name="idp-redirect.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect/" security-domain="idp" support-signatures="false" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect1/" post-binding="false" support-signatures="false"/>
-                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect2/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect1/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sp-redirect2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect2/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
             <federation name="federation-redirect-with-signatures">
@@ -343,25 +343,25 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
+                <identity-provider name="idp-redirect-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-redirect-sig/" security-domain="idp" support-signatures="true" strict-post-binding="false">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
-                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig1/" post-binding="false" support-signatures="true"/>
+                    <service-provider name="sp-redirect-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-redirect-sig2/" post-binding="false" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-simple-post-binding">
-                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post/" security-domain="idp">
+                <identity-provider name="idp-post.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post/" security-domain="idp">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post1/"/>
-                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post2/"/>
+                    <service-provider name="sp-post1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post1/"/>
+                    <service-provider name="sp-post2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post2/"/>
                 </service-providers>
             </federation>
             <federation name="federation-post-with-signatures">
@@ -370,14 +370,14 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-post-sig/" security-domain="idp" support-signatures="true">
+                <identity-provider name="idp-post-sig.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-post-sig/" security-domain="idp" support-signatures="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig1/" support-signatures="true"/>
-                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-post-sig2/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig1/" support-signatures="true"/>
+                    <service-provider name="sp-post-sig2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-post-sig2/" support-signatures="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-metadata">
@@ -386,20 +386,20 @@
                         <key name="servercert" host="${jboss.bind.address:localhost},127.0.0.1"/>
                     </keys>
                 </key-store>
-                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:8080/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
+                <identity-provider name="idp-metadata.war" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/idp-metadata/" security-domain="idp" support-signatures="true" support-metadata="true">
                     <trust>
                         <trust-domain name="${jboss.bind.address:127.0.0.1}"/>
                     </trust>
                 </identity-provider>
                 <service-providers>
-                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata1/" support-signatures="true" support-metadata="true"/>
-                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sp-metadata2/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata1.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata1/" support-signatures="true" support-metadata="true"/>
+                    <service-provider name="sp-metadata2.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sp-metadata2/" support-signatures="true" support-metadata="true"/>
                 </service-providers>
             </federation>
             <federation name="federation-with-external-idp">
                 <identity-provider name="idp-external" url="http://idp.external.com/" external="true"/>
                 <service-providers>
-                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:8080/sales-on-external/" post-binding="false" support-signatures="false"/>
+                    <service-provider name="sales-on-external.war" security-domain="sp" url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/sales-on-external/" post-binding="false" support-signatures="false"/>
                 </service-providers>
             </federation>
         </subsystem>
diff --git a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-xts.xml b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-xts.xml
index b418feac826..4f6b66f097a 100644
--- a/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-xts.xml
+++ b/testsuite/integration/manualmode/src/test/resources/legacy-configs/standalone/eap-7-1-0-xts.xml
@@ -520,7 +520,7 @@
         <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
         <subsystem xmlns="urn:jboss:domain:xts:2.0">
             <host name="default-host"/>
-            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:8080/ws-c11/ActivationService"/>
+            <xts-environment url="http://${jboss.bind.address:127.0.0.1}:${jboss.http.port:8080}/ws-c11/ActivationService"/>
             <default-context-propagation enabled="true"/>
         </subsystem>
     </profile>
diff --git a/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/federation/SAMLIDPInitiatedTestCase.java b/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/federation/SAMLIDPInitiatedTestCase.java
index 01766dcb01c..2e69d7b0d61 100644
--- a/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/federation/SAMLIDPInitiatedTestCase.java
+++ b/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/federation/SAMLIDPInitiatedTestCase.java
@@ -60,7 +60,7 @@
 
     static {
         String node0 = System.getProperty("node0", "127.0.0.1");
-        String port0 = "8080";
+        String port0 = System.getProperty("jboss.http.port", "8080");
         try {
             webURI = URLEncoder.encode("http://" + (node0.indexOf(":") > -1 ? "[" + node0 + "]" : node0) + ":" + port0, "ISO-8859-1");
         } catch (UnsupportedEncodingException e) {
diff --git a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/idp-metadata.xml b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/idp-metadata.xml
index 774b567fa6c..e83c8e604c3 100644
--- a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/idp-metadata.xml
+++ b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/idp-metadata.xml
@@ -2,18 +2,18 @@
 <EntitiesDescriptor Name="urn:mace:shibboleth:testshib:two"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/idp-metadata">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata">
 		<IDPSSODescriptor 
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
-				Location="http://${node0.escaped}:8080/idp-metadata" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata" />
 			<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-				Location="http://${node0.escaped}:8080/idp-metadata" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata" />
 			<SingleSignOnService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-				Location="http://${node0.escaped}:8080/idp-metadata" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata" />
 		</IDPSSODescriptor>
 		<Organization>
 			<OrganizationName xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -29,13 +29,13 @@
 			<EmailAddress>admin@mycompany.com</EmailAddress>
 		</ContactPerson>
 	</EntityDescriptor>
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/sp-metadata1/">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata1/">
 		<SPSSODescriptor
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<AssertionConsumerService
-				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:8080/sp-metadata1/"
+				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata1/"
 				index="1" isDefault="true" />
 		</SPSSODescriptor>
 		<Organization>
@@ -52,13 +52,13 @@
 			<EmailAddress>admin@mycompany.com</EmailAddress>
 		</ContactPerson>
 	</EntityDescriptor>
-    <EntityDescriptor entityID="http://${node0.escaped}:8080/sp-metadata2/">
+    <EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata2/">
 		<SPSSODescriptor
             protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<AssertionConsumerService
-                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:8080/sp-metadata2/"
+                Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata2/"
                 index="1" isDefault="true" />
 		</SPSSODescriptor>
 		<Organization>
diff --git a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata1.xml b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata1.xml
index 6f0d849e3e2..3e3a3f4f206 100644
--- a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata1.xml
+++ b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata1.xml
@@ -2,24 +2,24 @@
 <EntitiesDescriptor Name="urn:mace:shibboleth:testshib:two"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/idp-metadata/">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/">
 		<IDPSSODescriptor
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleSignOnService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleLogoutService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-				Location="http://${node0.escaped}:8080/idp-metadata/?GLO=true" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/?GLO=true" />
 			<SingleLogoutService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-				Location="http://${node0.escaped}:8080/idp-metadata/SLO" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/SLO" />
 		</IDPSSODescriptor>
 		<Organization>
 			<OrganizationName xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -35,13 +35,13 @@
 			<EmailAddress>admin@mycompany.com</EmailAddress>
 		</ContactPerson>
 	</EntityDescriptor>
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/sp-metadata1/">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata1/">
 		<SPSSODescriptor
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<AssertionConsumerService
-				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:8080/sp-metadata1/"
+				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata1/"
 				index="1" isDefault="true" />
 		</SPSSODescriptor>
 		<Organization>
diff --git a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata2.xml b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata2.xml
index 2bc325af1e1..dc838f1fbb5 100644
--- a/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata2.xml
+++ b/testsuite/integration/picketlink/src/test/resources/org/wildfly/test/integration/security/picketlink/federation/sp-metadata2.xml
@@ -2,24 +2,24 @@
 <EntitiesDescriptor Name="urn:mace:shibboleth:testshib:two"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/idp-metadata/">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/">
 		<IDPSSODescriptor
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleSignOnService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-				Location="http://${node0.escaped}:8080/idp-metadata/" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/" />
 			<SingleLogoutService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-				Location="http://${node0.escaped}:8080/idp-metadata/?GLO=true" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/?GLO=true" />
 			<SingleLogoutService
 				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-				Location="http://${node0.escaped}:8080/idp-metadata/SLO" />
+				Location="http://${node0.escaped}:${jboss.http.port:8080}/idp-metadata/SLO" />
 		</IDPSSODescriptor>
 		<Organization>
 			<OrganizationName xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -35,13 +35,13 @@
 			<EmailAddress>admin@mycompany.com</EmailAddress>
 		</ContactPerson>
 	</EntityDescriptor>
-	<EntityDescriptor entityID="http://${node0.escaped}:8080/sp-metadata2/">
+	<EntityDescriptor entityID="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata2/">
 		<SPSSODescriptor
 			protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext">
 			<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 			</NameIDFormat>
 			<AssertionConsumerService
-				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:8080/sp-metadata2/"
+				Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://${node0.escaped}:${jboss.http.port:8080}/sp-metadata2/"
 				index="1" isDefault="true" />
 		</SPSSODescriptor>
 		<Organization>
diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java
index 76e935b1f84..b9a5b0d7af3 100644
--- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java
+++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java
@@ -65,7 +65,7 @@
     private static final String DEPLOYMENT_NO_PERM = "deployment-no-perm";
 
     private static Logger LOGGER = Logger.getLogger(MaximumPermissionsTestCase.class);
-    private static final String ADDRESS_WEB = "http://" + TestSuiteEnvironment.getServerAddress() + ":8080/";
+    private static final String ADDRESS_WEB = "http://" + TestSuiteEnvironment.getServerAddress() + ":" + System.getProperty("jboss.http.port", "8080") + "/";
 
     private static final String INDEX_HTML = "OK";
 
diff --git a/testsuite/integration/secman/src/test/resources/jboss-ejb-client.properties b/testsuite/integration/secman/src/test/resources/jboss-ejb-client.properties
index ad2ef5974a1..b89457a6b3b 100644
--- a/testsuite/integration/secman/src/test/resources/jboss-ejb-client.properties
+++ b/testsuite/integration/secman/src/test/resources/jboss-ejb-client.properties
@@ -24,7 +24,7 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/deployment/rar/tests/eardeployment/EarDeploymentTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/deployment/rar/tests/eardeployment/EarDeploymentTestCase.java
index 6eecc5c780e..42a5428845b 100644
--- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/deployment/rar/tests/eardeployment/EarDeploymentTestCase.java
+++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/deployment/rar/tests/eardeployment/EarDeploymentTestCase.java
@@ -100,7 +100,7 @@ public static EnterpriseArchive createDeployment() throws Exception {
      */
     @Test
     public void testWebConfiguration() throws Throwable {
-        URL servletURL = new URL("http://" + url.getHost() + ":8080/servlet" + RaServlet.URL_PATTERN);
+        URL servletURL = new URL("http://" + url.getHost() + ":" + System.getProperty("jboss.http.port", "8080") + "/servlet" + RaServlet.URL_PATTERN);
         BufferedReader br = new BufferedReader(new InputStreamReader(servletURL.openStream(), StandardCharsets.UTF_8));
         String message = br.readLine();
         assertEquals(RaServlet.SUCCESS, message);
diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/socketbindings/SocketBindingBoundPortsTestCase.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/socketbindings/SocketBindingBoundPortsTestCase.java
index aa91a6f290d..93e7e6577cd 100644
--- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/socketbindings/SocketBindingBoundPortsTestCase.java
+++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/socketbindings/SocketBindingBoundPortsTestCase.java
@@ -63,7 +63,7 @@ public void testHttpBoundSocket() throws IOException {
         ModelNode response = execute(operation);
         ModelNode result = response.get(RESULT);
         Assert.assertTrue("http socket binding is not set as bound.", result.get(BOUND).asBoolean());
-        Assert.assertEquals(result.get(BOUND_PORT).asInt(), 8080);
+        Assert.assertEquals(result.get(BOUND_PORT).asInt(), Integer.parseInt(System.getProperty("jboss.http.port", "8080")));
     }
 
     @Test
diff --git a/testsuite/integration/src/test/scripts/manualmode-build.xml b/testsuite/integration/src/test/scripts/manualmode-build.xml
index 972850efd40..e9dfec81a29 100644
--- a/testsuite/integration/src/test/scripts/manualmode-build.xml
+++ b/testsuite/integration/src/test/scripts/manualmode-build.xml
@@ -112,7 +112,7 @@
 
         <!-- Connects back to original host (node0) -->
         <ts.config-as.add-remote-outbound-connection name="jbossas-with-remote-outbound-connection" node="${node0}"
-                                                     remotePort="8080" protocol="remote+http" securityRealm="PasswordRealm" userName="user1"/>
+                                                     remotePort="${jboss.http.port:8080}" protocol="remote+http" securityRealm="PasswordRealm" userName="user1"/>
         <ts.config-as.add-identity-realm name="jbossas-with-remote-outbound-connection" realmName="PasswordRealm"
                                          secret="cGFzc3dvcmQx"/>
 
diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionInvalidateTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionInvalidateTestCase.java
index 543f43dac3e..a677637a179 100644
--- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionInvalidateTestCase.java
+++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionInvalidateTestCase.java
@@ -75,7 +75,7 @@ public void testInvalidateSessions() throws Exception {
             ModelNode opRes = managementClient.getControllerClient().execute(operation);
             Assert.assertEquals("success", opRes.get(ModelDescriptionConstants.OUTCOME).asString());
             Assert.assertEquals(false, opRes.get(ModelDescriptionConstants.RESULT).asBoolean());
-            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/invalidate/SessionPersistenceServlet");
+            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/invalidate/SessionPersistenceServlet");
             HttpResponse res = client.execute(get);
             String sessionId = null;
             for (Header cookie : res.getHeaders("Set-Cookie")) {
diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionManagementTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionManagementTestCase.java
index d07c04da65d..1821c2e1c92 100644
--- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionManagementTestCase.java
+++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionManagementTestCase.java
@@ -89,7 +89,7 @@ public void testSessionManagementOperations() throws Exception {
             Assert.assertEquals(opRes.toString(), "success", opRes.get(ModelDescriptionConstants.OUTCOME).asString());
             Assert.assertEquals(Collections.emptyList(), opRes.get(ModelDescriptionConstants.RESULT).asList());
             long c1 = System.currentTimeMillis();
-            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/management/SessionPersistenceServlet");
+            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/management/SessionPersistenceServlet");
             HttpResponse res = client.execute(get);
             long c2 = System.currentTimeMillis();
             String sessionId = null;
@@ -192,7 +192,7 @@ public void testSessionManagementOperationsNegative() throws Exception {
             executeOperation(operation, INVALIDATE_SESSION);
 
             HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() +
-                    ":8080/management/SessionPersistenceServlet");
+                    ":" + TestSuiteEnvironment.getHttpPort() + "/management/SessionPersistenceServlet");
             HttpResponse res = client.execute(get);
             sessionId = null;
             for (Header cookie : res.getHeaders("Set-Cookie")) {
diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionPersistenceTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionPersistenceTestCase.java
index a2931178a43..1684da1563f 100644
--- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionPersistenceTestCase.java
+++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/session/SessionPersistenceTestCase.java
@@ -64,7 +64,7 @@
     @Test
     public void testLifeCycle() throws Exception {
         try (CloseableHttpClient client = HttpClients.createDefault()) {
-            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/sessionPersistence/SessionPersistenceServlet");
+            HttpGet get = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/sessionPersistence/SessionPersistenceServlet");
             deployer.deploy("web");
             String result = runGet(get, client);
             assertEquals("0", result);
diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/sharedsession/SharedSessionTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/sharedsession/SharedSessionTestCase.java
index 8ee627f960b..8821140f800 100644
--- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/sharedsession/SharedSessionTestCase.java
+++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/sharedsession/SharedSessionTestCase.java
@@ -84,8 +84,8 @@ public void testSharedSessionsOneEar() throws IOException {
         // Note that this test should not need to use a relaxed domain handling, however the http client does not treat ipv6 domains (e.g. ::1) properly
         HttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient();
 
-        HttpGet get1 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/war1/SharedSessionServlet");
-        HttpGet get2 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/war2/SharedSessionServlet");
+        HttpGet get1 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/war1/SharedSessionServlet");
+        HttpGet get2 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/war2/SharedSessionServlet");
 
         String result = runGet(get1, client);
         assertEquals("0", result);
@@ -115,8 +115,8 @@ public void testNotSharedSessions() throws IOException {
         // Note that this test should not need to use a relaxed domain handling, however the http client does not treat ipv6 domains (e.g. ::1) properly
         HttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient();
 
-        HttpGet getX = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/warX/SharedSessionServlet");
-        HttpGet getY = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/warY/SharedSessionServlet");
+        HttpGet getX = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/warX/SharedSessionServlet");
+        HttpGet getY = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/warY/SharedSessionServlet");
 
         String result = runGet(getX, client);
         assertEquals("0", result);
@@ -141,10 +141,10 @@ public void testSharedSessionsDoNotInterleave() throws IOException {
         // Note that this test should not need to use a relaxed domain handling, however the http client does not treat ipv6 domains (e.g. ::1) properly
         HttpClient client = TestHttpClientUtils.promiscuousCookieHttpClient();
 
-        HttpGet get1 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/war1/SharedSessionServlet");
-        HttpGet get2 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/war2/SharedSessionServlet");
-        HttpGet getX = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/warX/SharedSessionServlet");
-        HttpGet getY = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":8080/warY/SharedSessionServlet");
+        HttpGet get1 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/war1/SharedSessionServlet");
+        HttpGet get2 = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/war2/SharedSessionServlet");
+        HttpGet getX = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/warX/SharedSessionServlet");
+        HttpGet getY = new HttpGet("http://" + TestSuiteEnvironment.getServerAddress() + ":" + TestSuiteEnvironment.getHttpPort() + "/warY/SharedSessionServlet");
 
         String result = runGet(get1, client);
         assertEquals("0", result);
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/authentication/policy/AuthenticationPolicyContextTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/authentication/policy/AuthenticationPolicyContextTestCase.java
index f7da2d3949d..cda53c668ed 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/authentication/policy/AuthenticationPolicyContextTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/authentication/policy/AuthenticationPolicyContextTestCase.java
@@ -101,7 +101,7 @@
     private static final String USERNAME = "UserA";
     private static final String PASSWORD = "PassA";
     private static final String DEFAULT_HOST = getHostname();
-    private static final int DEFAULT_PORT = 8080;
+    private static final int DEFAULT_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
 
     private volatile ModelControllerClient modelControllerClient;
     private static WSTrustClient wsClient;
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/SimpleService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/SimpleService.wsdl
index 3658e89a1e8..004336e182c 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/SimpleService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/SimpleService.wsdl
@@ -44,7 +44,7 @@
     </wsdl:binding>
     <wsdl:service name="SimpleService">
         <wsdl:port binding="tns:SimpleServiceSoapBinding" name="SimpleServicePort">
-            <soap:address location="http://server.domain:8080/schema-location-rewrite/SimpleService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/schema-location-rewrite/SimpleService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/imported/AnotherService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/imported/AnotherService.wsdl
index 3403c85ccfa..7680a844099 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/imported/AnotherService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/schemalocations/imported/AnotherService.wsdl
@@ -41,7 +41,7 @@
     </wsdl:binding>
     <wsdl:service name="AnotherService">
         <wsdl:port binding="tns:AnotherServiceSoapBinding" name="AnotherServicePort">
-            <soap:address location="http://server.domain:8080/schema-location-rewrite/AnotherService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/schema-location-rewrite/AnotherService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java
index f5f906f322c..aeed1252e58 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java
@@ -95,7 +95,7 @@
                 new RuntimePermission("org.apache.cxf.permission", "resolveUri"),
                 new RuntimePermission("createClassLoader"),
                 new RuntimePermission("accessDeclaredMembers"),
-                new SocketPermission(node0 + ":8080", "connect,resolve")), "jboss-permissions.xml");
+                new SocketPermission(node0 + ":" + System.getProperty("jboss.http.port", "8080"), "connect,resolve")), "jboss-permissions.xml");
 
         return ear;
     }
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java
index 458da00dd0c..162e3b1b985 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java
@@ -88,7 +88,7 @@ public static WebArchive clientDeployment() {
                 new RuntimePermission("org.apache.cxf.permission", "resolveUri"),
                 new RuntimePermission("createClassLoader"),
                 new RuntimePermission("accessDeclaredMembers"),
-                new SocketPermission(node0 + ":8080", "connect,resolve")), "jboss-permissions.xml");
+                new SocketPermission(node0 + ":" + System.getProperty("jboss.http.port", "8080"), "connect,resolve")), "jboss-permissions.xml");
         return war;
     }
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java
index 2b0ad3045f0..39d7afe71ce 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java
@@ -98,7 +98,7 @@ public static JavaArchive deployment() {
                         new RuntimePermission("org.apache.cxf.permission", "resolveUri"),
                         new RuntimePermission("createClassLoader"),
                         new RuntimePermission("accessDeclaredMembers"),
-                        new SocketPermission(node0 + ":8080", "connect,resolve")
+                        new SocketPermission(node0 + ":" + System.getProperty("jboss.http.port", "8080"), "connect,resolve")
                 ), "jboss-permissions.xml");
     }
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/TestService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/TestService.wsdl
index 77ce4a1c5b3..d5b5e569f73 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/TestService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/TestService.wsdl
@@ -31,7 +31,7 @@
     </binding>
     <service name='EndpointService'>
         <port binding='tns:EndpointInterfaceBinding' name='EJB3BeanPort'>
-            <soap:address location='http://${node0:localhost}:8080/ws-serviceref-example/EndpointService/EJB3Bean'/>
+            <soap:address location='http://${node0:localhost}:${jboss.http.port:8080}/ws-serviceref-example/EndpointService/EJB3Bean'/>
         </port>
     </service>
 </definitions>
\ No newline at end of file
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/NoAddressingService.xml b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/NoAddressingService.xml
index 8f10c2bb262..b0f4112d087 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/NoAddressingService.xml
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/NoAddressingService.xml
@@ -49,7 +49,7 @@
     </wsdl:binding>
     <wsdl:service name="AddressingService">
         <wsdl:port binding="tns:AddressingServiceSoapBinding" name="AddressingServicePort">
-            <soap:address location="http://server.domain:8080/jaxws-wsa/AddressingService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/jaxws-wsa/AddressingService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/OptionalAddressingService.xml b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/OptionalAddressingService.xml
index 24a1a6a2ea0..7a1f0c55ac5 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/OptionalAddressingService.xml
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/OptionalAddressingService.xml
@@ -52,7 +52,7 @@
     </wsdl:binding>
     <wsdl:service name="AddressingService">
         <wsdl:port binding="tns:AddressingServiceSoapBinding" name="AddressingServicePort">
-            <soap:address location="http://server.domain:8080/jaxws-wsa/AddressingService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/jaxws-wsa/AddressingService"/>
         </wsdl:port>
     </wsdl:service>
     <wsp:Policy wsu:Id="AddressingServiceSoapBinding_WSAM_Addressing_Policy"
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/RequiredAddressingService.xml b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/RequiredAddressingService.xml
index 5a57c3df0f5..08ef43a7672 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/RequiredAddressingService.xml
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsa/RequiredAddressingService.xml
@@ -52,7 +52,7 @@
     </wsdl:binding>
     <wsdl:service name="AddressingService">
         <wsdl:port binding="tns:AddressingServiceSoapBinding" name="AddressingServicePort">
-            <soap:address location="http://server.domain:8080/jaxws-wsa/AddressingService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/jaxws-wsa/AddressingService"/>
         </wsdl:port>
     </wsdl:service>
     <wsp:Policy wsu:Id="AddressingServiceSoapBinding_WSAM_Addressing_Policy"
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsrm/ReliableService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsrm/ReliableService.wsdl
index b3e308e2747..6fab44fcf39 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsrm/ReliableService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsrm/ReliableService.wsdl
@@ -71,7 +71,7 @@
     </wsdl:binding>
     <wsdl:service name="ReliableService">
         <wsdl:port binding="tns:ReliableServiceSoapBinding" name="ReliableServicePort">
-            <soap:address location="http://server.domain:8080/ws-reliable-messaging-example/ReliableService"/>
+            <soap:address location="http://server.domain:${jboss.http.port:8080}/ws-reliable-messaging-example/ReliableService"/>
         </wsdl:port>
     </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/picketlink-sts.xml b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/picketlink-sts.xml
index 13a0e16048a..27d82ea0195 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/picketlink-sts.xml
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/picketlink-sts.xml
@@ -5,7 +5,7 @@
         <Auth Key="KeyStorePass" Value="stsspass"/>
         <Auth Key="SigningKeyAlias" Value="mystskey"/>
         <Auth Key="SigningKeyPass" Value="stskpass"/>
-        <ValidatingAlias Key="http://@node0@:8080/jaxws-samples-wsse-policy-trust/SecurityService" Value="myservicekey"/>
+        <ValidatingAlias Key="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust/SecurityService" Value="myservicekey"/>
     </KeyProvider>
     <TokenProviders>
         <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML11TokenProvider"
@@ -19,7 +19,7 @@
     </TokenProviders>
     <!-- Erroneously mandatory element below (in PLINK 2.1.8.Final / 2.5.1.Final) -->
     <ServiceProviders>
-        <ServiceProvider Endpoint="http://@node0@:8080/jaxws-samples-wsse-policy-trust/SecurityService"
+        <ServiceProvider Endpoint="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust/SecurityService"
                          TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
                          TruststoreAlias="myservicekey"/>
     </ServiceProviders>
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ActAsService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ActAsService.wsdl
index 2d179b276c5..7cdc6eb48eb 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ActAsService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ActAsService.wsdl
@@ -45,7 +45,7 @@
     </binding>
     <service name="ActAsService">
         <port name="ActAsServicePort" binding="tns:ActAsServicePortBinding">
-            <soap:address location="http://@node0@:8080/jaxws-samples-wsse-policy-trust-actas/ActAsService"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-actas/ActAsService"/>
         </port>
     </service>
 
@@ -71,7 +71,7 @@
                                     <sp:Issuer>
                                         <wsaws:Address>http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
                                         <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-                                                        wsdli:wsdlLocation="http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+                                                        wsdli:wsdlLocation="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
                                             <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                                                               xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
                                                               EndpointName="UT_Port">stsns:SecurityTokenService
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/BearerService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/BearerService.wsdl
index 34954bd2f32..5326d0f12ae 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/BearerService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/BearerService.wsdl
@@ -99,7 +99,7 @@
                                 <wsaws:Address>http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService</wsaws:Address>
                                 <wsaws:Metadata
                                         xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-                                        wsdli:wsdlLocation="http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
+                                        wsdli:wsdlLocation="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-sts-bearer/SecurityTokenService?wsdl">
                                     <wsaw:ServiceName
                                             xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                                             xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl
index 01f3989eecd..bb4e6d71e3a 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/HolderOfKeyService.wsdl
@@ -99,7 +99,7 @@
                                 <wsaws:Address>http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService</wsaws:Address>
                                 <wsaws:Metadata
                                         xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-                                        wsdli:wsdlLocation="http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl">
+                                        wsdli:wsdlLocation="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-sts-holderofkey/SecurityTokenService?wsdl">
                                     <wsaw:ServiceName
                                             xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                                             xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl
index b574395046e..35fcaab4b74 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl
@@ -45,7 +45,7 @@
     </binding>
     <service name="OnBehalfOfService">
         <port name="OnBehalfOfServicePort" binding="tns:OnBehalfOfServicePortBinding">
-            <soap:address location="http://@node0@:8080/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-onbehalfof/OnBehalfOfService"/>
         </port>
     </service>
 
@@ -71,7 +71,7 @@
                                     <sp:Issuer>
                                         <wsaws:Address>http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
                                         <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-                                                        wsdli:wsdlLocation="http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+                                                        wsdli:wsdlLocation="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
                                             <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                                                               xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
                                                               EndpointName="UT_Port">stsns:SecurityTokenService
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl
index d70c56128e3..9496c99bf97 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/PicketLinkSTS.wsdl
@@ -66,7 +66,7 @@
     </wsdl:binding>
     <wsdl:service name="PicketLinkSTS">
         <wsdl:port name="PicketLinkSTSPort" binding="tns:STSBinding">
-            <soap12:address location="http://@node0@:8080/picketlink-sts/PicketLinkSTS"/>
+            <soap12:address location="http://@node0@:${jboss.http.port:8080}/picketlink-sts/PicketLinkSTS"/>
         </wsdl:port>
     </wsdl:service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/SecurityService.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/SecurityService.wsdl
index 9ddf57234ba..f5210c0d8d3 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/SecurityService.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/SecurityService.wsdl
@@ -44,7 +44,7 @@
     </binding>
     <service name="SecurityService">
         <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-            <soap:address location="http://@node0@:8080/jaxws-samples-wsse-policy-trust/SecurityService"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust/SecurityService"/>
         </port>
     </service>
 
@@ -70,7 +70,7 @@
                                     <sp:Issuer>
                                         <wsaws:Address>http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService</wsaws:Address>
                                         <wsaws:Metadata xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-                                                        wsdli:wsdlLocation="http://@node0@:8080/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
+                                                        wsdli:wsdlLocation="http://@node0@:${jboss.http.port:8080}/jaxws-samples-wsse-policy-trust-sts/SecurityTokenService?wsdl">
                                             <wsaw:ServiceName xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
                                                               xmlns:stsns="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
                                                               EndpointName="UT_Port">stsns:SecurityTokenService
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
index 88cfc1fc628..1e7d7b5abd4 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/bearer-ws-trust-1.4-service.wsdl
@@ -210,7 +210,7 @@
 
     <wsdl:service name="SecurityTokenService">
         <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-            <soap:address location="http://@node0@:8080/SecurityTokenService/UT"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/SecurityTokenService/UT"/>
         </wsdl:port>
     </wsdl:service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl
index 88cfc1fc628..1e7d7b5abd4 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/holderofkey-ws-trust-1.4-service.wsdl
@@ -210,7 +210,7 @@
 
     <wsdl:service name="SecurityTokenService">
         <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-            <soap:address location="http://@node0@:8080/SecurityTokenService/UT"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/SecurityTokenService/UT"/>
         </wsdl:port>
     </wsdl:service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
index d2b3a84cb7e..e79319fb1ef 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WEB-INF/wsdl/ws-trust-1.4-service.wsdl
@@ -181,7 +181,7 @@
 
     <wsdl:service name="SecurityTokenService">
         <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-            <soap:address location="http://@node0@:8080/SecurityTokenService/UT"/>
+            <soap:address location="http://@node0@:${jboss.http.port:8080}/SecurityTokenService/UT"/>
         </wsdl:port>
     </wsdl:service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
index 64c16c00103..f2fa35db3ee 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/trust/WSTrustTestCase.java
@@ -486,7 +486,7 @@ public void testHolderOfKey() throws Exception {
             BusFactory.setThreadDefaultBus(bus);
 
             final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/holderofkeywssecuritypolicy", "HolderOfKeyService");
-            final URL wsdlURL = new URL("https", serviceURL.getHost(), serviceURL.getPort() - 8080 + 8444, "/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService?wsdl");
+            final URL wsdlURL = new URL("https", serviceURL.getHost(), serviceURL.getPort() - Integer.parseInt(System.getProperty("jboss.http.port", "8080")) + 8444, "/jaxws-samples-wsse-policy-trust-holderofkey/HolderOfKeyService?wsdl");
             Service service = Service.create(wsdlURL, serviceName);
             HolderOfKeyIface proxy = (HolderOfKeyIface) service.getPort(HolderOfKeyIface.class);
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign-encrypt.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign-encrypt.wsdl
index c6ccfbf0f59..dc9e39bdc91 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign-encrypt.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign-encrypt.wsdl
@@ -40,7 +40,7 @@
     </binding>
     <service name="EJBEncryptSecurityService">
         <port name="EJBEncryptSecurityServicePort" binding="tns:EJBEncryptSecurityServicePortBinding">
-            <soap:address location="http://@jboss.bind.address@:8080/jaxws-wsse-sign-encrypt"/>
+            <soap:address location="http://@jboss.bind.address@:${jboss.http.port:8080}/jaxws-wsse-sign-encrypt"/>
         </port>
     </service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign.wsdl
index 583c5e3a3c4..b9cfb23bfe9 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-ejb-sign.wsdl
@@ -40,7 +40,7 @@
     </binding>
     <service name="EJBSecurityService">
         <port name="EJBSecurityServicePort" binding="tns:EJBSecurityServicePortBinding">
-            <soap:address location="http://@jboss.bind.address@:8080/jaxws-wsse-sign"/>
+            <soap:address location="http://@jboss.bind.address@:${jboss.http.port:8080}/jaxws-wsse-sign"/>
         </port>
     </service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign-encrypt.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign-encrypt.wsdl
index 038da4e8aea..24568e74d4a 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign-encrypt.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign-encrypt.wsdl
@@ -40,7 +40,7 @@
     </binding>
     <service name="EncryptSecurityService">
         <port name="EncryptSecurityServicePort" binding="tns:EncryptSecurityServicePortBinding">
-            <soap:address location="http://@jboss.bind.address@:8080/jaxws-wsse-sign-encrypt"/>
+            <soap:address location="http://@jboss.bind.address@:${jboss.http.port:8080}/jaxws-wsse-sign-encrypt"/>
         </port>
     </service>
 
diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign.wsdl b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign.wsdl
index fa7533e5eb7..b859d3d47c6 100644
--- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign.wsdl
+++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/wsse/wsdl/SecurityService-sign.wsdl
@@ -40,7 +40,7 @@
     </binding>
     <service name="SecurityService">
         <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding">
-            <soap:address location="http://@jboss.bind.address@:8080/jaxws-wsse-sign"/>
+            <soap:address location="http://@jboss.bind.address@:${jboss.http.port:8080}/jaxws-wsse-sign"/>
         </port>
     </service>
 
diff --git a/testsuite/integration/ws/src/test/resources/jboss-ejb-client.properties b/testsuite/integration/ws/src/test/resources/jboss-ejb-client.properties
index ad2ef5974a1..b89457a6b3b 100644
--- a/testsuite/integration/ws/src/test/resources/jboss-ejb-client.properties
+++ b/testsuite/integration/ws/src/test/resources/jboss-ejb-client.properties
@@ -24,7 +24,7 @@ remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
 remote.connections=default
 
 remote.connection.default.host=${node0:localhost}
-remote.connection.default.port=8080
+remote.connection.default.port=${jboss.http.port:8080}
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false
 remote.connection.default.connect.options.org.xnio.Options.WORKER_TASK_MAX_THREADS=4
diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsat/client/ATClient.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsat/client/ATClient.java
index e63febe34d4..88b429128cb 100644
--- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsat/client/ATClient.java
+++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsat/client/ATClient.java
@@ -39,8 +39,7 @@
     private static final Logger log = Logger.getLogger(ATClient.class);
 
     private static final String NODE0_ADDR = NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost"));
-    // parametrize this one day in the future?
-    private static final int NODE0_PORT = 8080;
+    private static final int NODE0_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
 
     private static final String TARGET_NAMESPACE = "http://www.jboss.com/jbossas/test/xts/wsat/at/";
     private static final String DEFAULT_PORT_NAME = "AT";
diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/coordinatorcompletion/client/BACoordinatorCompletionClient.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/coordinatorcompletion/client/BACoordinatorCompletionClient.java
index 64a9c56d7f0..adebe20b239 100644
--- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/coordinatorcompletion/client/BACoordinatorCompletionClient.java
+++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/coordinatorcompletion/client/BACoordinatorCompletionClient.java
@@ -40,7 +40,7 @@
     private static final Logger log = Logger.getLogger(BACoordinatorCompletionClient.class);
 
     private static final String NODE0_ADDR = NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost"));
-    private static final int NODE0_PORT = 8080;
+    private static final int NODE0_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
 
     private static final String TARGET_NAMESPACE = "http://www.jboss.com/jbossas/test/xts/ba/coordinatorcompletion/";
     private static final String DEFAULT_PORT_NAME = "BACoordinatorCompletion";
diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/participantcompletion/client/BAParticipantCompletionClient.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/participantcompletion/client/BAParticipantCompletionClient.java
index 975ae2e9e3a..7c644e55ec6 100644
--- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/participantcompletion/client/BAParticipantCompletionClient.java
+++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/wsba/participantcompletion/client/BAParticipantCompletionClient.java
@@ -39,7 +39,7 @@
     private static final Logger log = Logger.getLogger(BAParticipantCompletionClient.class);
 
     private static final String NODE0_ADDR = NetworkUtils.formatPossibleIpv6Address(System.getProperty("node0", "localhost"));
-    private static final int NODE0_PORT = 8080;
+    private static final int NODE0_PORT = Integer.parseInt(System.getProperty("jboss.http.port", "8080"));
 
     private static final String TARGET_NAMESPACE = "http://www.jboss.com/jbossas/test/xts/ba/participantcompletion/";
     private static final String DEFAULT_PORT_NAME = "BAParticipantCompletion";
diff --git a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigTest.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigTest.java
index 62318af1bbc..43a43a6c3f7 100644
--- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigTest.java
+++ b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/LegacyConfigTest.java
@@ -129,7 +129,7 @@ private void validateServerProfile(ModelControllerClient client, String profile)
 
     private void verifyHttp(String profile) {
         try {
-            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(DomainTestSupport.slaveAddress) + ":8080").openConnection();
+            URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(DomainTestSupport.slaveAddress) + ":" + TestSuiteEnvironment.getHttpPort()).openConnection();
             connection.connect();
         } catch (IOException e) {
             Assert.fail("Cannot connect to profile " + profile + " " + e.toString());
diff --git a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java
index e3018076112..167979f8d2a 100644
--- a/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java
+++ b/testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/SimpleMixedDomainTest.java
@@ -110,7 +110,7 @@ public static synchronized void afterClass() {
 
     @Test
     public void test00001_ServerRunning() throws Exception {
-        URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(DomainTestSupport.slaveAddress) + ":8080").openConnection();
+        URLConnection connection = new URL("http://" + TestSuiteEnvironment.formatPossibleIpv6Address(DomainTestSupport.slaveAddress) + ":" + TestSuiteEnvironment.getHttpPort()).openConnection();
         connection.connect();
     }
 
diff --git a/testsuite/mixed-domain/src/test/resources/master-config/domain-minimal.xml b/testsuite/mixed-domain/src/test/resources/master-config/domain-minimal.xml
index a211d73fd7c..a5dff8fe022 100644
--- a/testsuite/mixed-domain/src/test/resources/master-config/domain-minimal.xml
+++ b/testsuite/mixed-domain/src/test/resources/master-config/domain-minimal.xml
@@ -79,7 +79,7 @@
             <socket-binding name="txn-status-manager" port="4713"/>
             <socket-binding name="messaging" port="5445" />
             <socket-binding name="messaging-throughput" port="5455"/>
-             <socket-binding name="http" port="8080"/>
+             <socket-binding name="http" port="${jboss.http.port:8080}"/>
              <socket-binding name="https" port="8443"/>
             <outbound-socket-binding name="mail-smtp">
                 <remote-destination host="localhost" port="25"/>
@@ -87,7 +87,7 @@
          </socket-binding-group>
         <socket-binding-group name="other-sockets" default-interface="public">
             <socket-binding name="ajp" port="8009"/>
-            <socket-binding name="http" port="8080"/>
+            <socket-binding name="http" port="${jboss.http.port:8080}"/>
             <socket-binding name="https" port="8443"/>
             <socket-binding name="jmx-connector-registry" interface="management" port="1090"/>
             <socket-binding name="jmx-connector-server" interface="management" port="1091"/>
