diff --git a/demos/tweetstore/rhcloud-tweetstore/pom.xml b/demos/tweetstore/rhcloud-tweetstore/pom.xml
index b9135fb3ca..9bf5061fc5 100644
--- a/demos/tweetstore/rhcloud-tweetstore/pom.xml
+++ b/demos/tweetstore/rhcloud-tweetstore/pom.xml
@@ -33,8 +33,8 @@
 
     <properties>
         <rhcloud.jboss.version>7.0.2.Final</rhcloud.jboss.version>
-        <rhcloud.jboss.address>localhost</rhcloud.jboss.address>
-        <rhcloud.jboss.port>8088</rhcloud.jboss.port>
+        <test.jboss.address>localhost</test.jboss.address>
+        <test.jboss.port>8088</test.jboss.port>
         <jclouds.tweetstore.container>jclouds-rhcloud-tweetstore</jclouds.tweetstore.container>
     </properties>
 
@@ -98,9 +98,9 @@
                                         <test.cloudonestorage.credential>${test.cloudonestorage.credential}</test.cloudonestorage.credential>
                                         <test.ninefold-storage.identity>${test.ninefold-storage.identity}</test.ninefold-storage.identity>
                                         <test.ninefold-storage.credential>${test.ninefold-storage.credential}</test.ninefold-storage.credential>
-                                        <rhcloud.jboss.home>${rhcloud.jboss.home}</rhcloud.jboss.home>
-                                        <rhcloud.jboss.address>${rhcloud.jboss.address}</rhcloud.jboss.address>
-                                        <rhcloud.jboss.port>${rhcloud.jboss.port}</rhcloud.jboss.port>
+                                        <jboss.home>${rhcloud.jboss.home}</jboss.home>
+                                        <jboss.address>${test.jboss.address}</jboss.address>
+                                        <jboss.port>${test.jboss.port}</jboss.port>
                                         <jclouds.tweetstore.blobstores>${jclouds.tweetstore.blobstores}</jclouds.tweetstore.blobstores>
                                         <jclouds.tweetstore.container>test.${jclouds.tweetstore.container}</jclouds.tweetstore.container>
                                         <jboss.embedded.root>${project.build.directory}/rhcloud-jboss</jboss.embedded.root>
@@ -108,8 +108,8 @@
                                         <warfile>${project.build.directory}/${project.build.finalName}</warfile>
                                     </systemPropertyVariables>
                                     <environmentVariables>
-                                        <OPENSHIFT_INTERNAL_IP>${rhcloud.jboss.address}</OPENSHIFT_INTERNAL_IP>
-                                        <OPENSHIFT_INTERNAL_PORT>${rhcloud.jboss.port}</OPENSHIFT_INTERNAL_PORT>
+                                        <OPENSHIFT_INTERNAL_IP>${test.jboss.address}</OPENSHIFT_INTERNAL_IP>
+                                        <OPENSHIFT_INTERNAL_PORT>${test.jboss.port}</OPENSHIFT_INTERNAL_PORT>
                                     </environmentVariables>
                                 </configuration>
                             </execution>
diff --git a/demos/tweetstore/rhcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/tweetstore/rhcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
index f66308f244..30dc27c70f 100644
--- a/demos/tweetstore/rhcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
+++ b/demos/tweetstore/rhcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java
@@ -172,7 +172,7 @@ public class TweetStoreLiveTest {
     }
    
    @BeforeTest(dependsOnMethods = "clearAndCreateContainers")
-   @Parameters({ "warfile", "rhcloud.jboss.address", "rhcloud.jboss.port", "rhcloud.jboss.home" })
+   @Parameters({ "warfile", "jboss.address", "jboss.port", "jboss.home" })
    public void startDevAppServer(final String warfile, final String address, final String port,
            String serverHome) throws Exception {
       url = new URL(String.format("http://%s:%s", address, port));
diff --git a/demos/tweetstore/rhcloud-tweetstore/src/test/resources/jbossas7/configuration/standalone.xml b/demos/tweetstore/rhcloud-tweetstore/src/test/resources/jbossas7/configuration/standalone.xml
index 8b2f988c68..dcdf6049b6 100644
--- a/demos/tweetstore/rhcloud-tweetstore/src/test/resources/jbossas7/configuration/standalone.xml
+++ b/demos/tweetstore/rhcloud-tweetstore/src/test/resources/jbossas7/configuration/standalone.xml
@@ -194,7 +194,7 @@
     </interfaces>
 
     <socket-binding-group name="standard-sockets" default-interface="public">
-        <socket-binding name="http" port="${rhcloud.jboss.port:8080}"/>
+        <socket-binding name="http" port="${jboss.port:8080}"/>
         <socket-binding name="https" port="8443"/>
         <socket-binding name="jmx-connector-registry" port="1090"/>
         <socket-binding name="jmx-connector-server" port="1091"/>