diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index 79b7dbf379..2cc62335b3 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -35,8 +35,8 @@
     <test.atmos.endpoint>https://accesspoint.atmosonline.com</test.atmos.endpoint>
     <test.atmos.api-version>1.3.0</test.atmos.api-version>
     <test.atmos.build-version />
-    <test.atmos.identity>FIXME</test.atmos.identity>
-    <test.atmos.credential>FIXME</test.atmos.credential>
+    <test.atmos.identity>FIXME_IDENTITY</test.atmos.identity>
+    <test.atmos.credential>FIXME_CREDENTIAL</test.atmos.credential>
 
     <jclouds.osgi.import>*</jclouds.osgi.import>
     <jclouds.osgi.export>org.jclouds.atmos*;version="${project.version}";-noimport:=true</jclouds.osgi.export>
diff --git a/apis/cloudsigma/pom.xml b/apis/cloudsigma/pom.xml
index bae3252f8a..a0c69f5268 100644
--- a/apis/cloudsigma/pom.xml
+++ b/apis/cloudsigma/pom.xml
@@ -35,8 +35,8 @@
     <test.cloudsigma.endpoint>https://api.cloudsigma.com</test.cloudsigma.endpoint>
     <test.cloudsigma.api-version>1.0</test.cloudsigma.api-version>
     <test.cloudsigma.build-version />
-    <test.cloudsigma.identity>FIXME</test.cloudsigma.identity>
-    <test.cloudsigma.credential>FIXME</test.cloudsigma.credential>
+    <test.cloudsigma.identity>FIXME_IDENTITY</test.cloudsigma.identity>
+    <test.cloudsigma.credential>FIXME_CREDENTIAL</test.cloudsigma.credential>
     <test.cloudsigma.template>imageId=f3c7c665-cd54-4a78-8fd2-7ec2f028cf29</test.cloudsigma.template>
     <jclouds.osgi.export>org.jclouds.cloudsigma*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index 40b992d22f..93e82b3739 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -35,8 +35,8 @@
     <test.elasticstack.endpoint>https://api-lon-p.elastichosts.com</test.elasticstack.endpoint>
     <test.elasticstack.api-version>2.0</test.elasticstack.api-version>
     <test.elasticstack.build-version />
-    <test.elasticstack.identity>FIXME</test.elasticstack.identity>
-    <test.elasticstack.credential>FIXME</test.elasticstack.credential>
+    <test.elasticstack.identity>FIXME_IDENTITY</test.elasticstack.identity>
+    <test.elasticstack.credential>FIXME_CREDENTIAL</test.elasticstack.credential>
     <test.elasticstack.template>imageId=38df0986-4d85-4b76-b502-3878ffc80161,loginUser=toor</test.elasticstack.template>
     <jclouds.osgi.export>org.jclouds.elasticstack*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index 44078f5696..6b2c15df98 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -32,11 +32,11 @@
   <packaging>bundle</packaging>
 
   <properties>
-    <test.vcloud.endpoint>FIXME</test.vcloud.endpoint>
+    <test.vcloud.endpoint>FIXME_ENDPOINT</test.vcloud.endpoint>
     <test.vcloud.api-version>1.0</test.vcloud.api-version>
     <test.vcloud.build-version />
-    <test.vcloud.identity>FIXME</test.vcloud.identity>
-    <test.vcloud.credential>FIXME</test.vcloud.credential>
+    <test.vcloud.identity>FIXME_IDENTITY</test.vcloud.identity>
+    <test.vcloud.credential>FIXME_CREDENTIAL</test.vcloud.credential>
     <test.vcloud.template />
     <jclouds.osgi.export>org.jclouds.vcloud*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index 586ebd2595..9a3c0eb4a2 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -35,8 +35,8 @@
     <test.cloudsigma-lvs.endpoint>https://api.lvs.cloudsigma.com</test.cloudsigma-lvs.endpoint>
     <test.cloudsigma-lvs.api-version>1.0</test.cloudsigma-lvs.api-version>
     <test.cloudsigma-lvs.build-version />
-    <test.cloudsigma-lvs.identity>FIXME</test.cloudsigma-lvs.identity>
-    <test.cloudsigma-lvs.credential>FIXME</test.cloudsigma-lvs.credential>
+    <test.cloudsigma-lvs.identity>FIXME_IDENTITY</test.cloudsigma-lvs.identity>
+    <test.cloudsigma-lvs.credential>FIXME_CREDENTIAL</test.cloudsigma-lvs.credential>
     <test.cloudsigma-lvs.template />
     <jclouds.osgi.export>org.jclouds.cloudsigma*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index acc974bb87..860f7b780b 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -35,8 +35,8 @@
     <test.cloudsigma-zrh.endpoint>https://api.zrh.cloudsigma.com</test.cloudsigma-zrh.endpoint>
     <test.cloudsigma-zrh.api-version>1.0</test.cloudsigma-zrh.api-version>
     <test.cloudsigma-zrh.build-version />
-    <test.cloudsigma-zrh.identity>FIXME</test.cloudsigma-zrh.identity>
-    <test.cloudsigma-zrh.credential>FIXME</test.cloudsigma-zrh.credential>
+    <test.cloudsigma-zrh.identity>FIXME_IDENTITY</test.cloudsigma-zrh.identity>
+    <test.cloudsigma-zrh.credential>FIXME_CREDENTIAL</test.cloudsigma-zrh.credential>
     <test.cloudsigma-zrh.template />
     <jclouds.osgi.export>org.jclouds.cloudsigma*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/providers/glesys/pom.xml b/providers/glesys/pom.xml
index 221348c9bb..789cccaac0 100644
--- a/providers/glesys/pom.xml
+++ b/providers/glesys/pom.xml
@@ -35,8 +35,8 @@
     <test.glesys.endpoint>https://api.glesys.com</test.glesys.endpoint>
     <test.glesys.api-version>1</test.glesys.api-version>
     <test.glesys.build-version>3.5.0</test.glesys.build-version>
-    <test.glesys.identity>FIXME</test.glesys.identity>
-    <test.glesys.credential>FIXME</test.glesys.credential>
+    <test.glesys.identity>FIXME_IDENTITY</test.glesys.identity>
+    <test.glesys.credential>FIXME_CREDENTIAL</test.glesys.credential>
     <test.glesys.template>osFamily=UBUNTU,osVersionMatches=1[012].[01][04],os64Bit=true,minRam=768</test.glesys.template>
     <jclouds.osgi.export>org.jclouds.glesys*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index 9e0e4cf9ec..59e7ff9797 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -35,8 +35,8 @@
     <test.gogrid.endpoint>https://api.gogrid.com/api</test.gogrid.endpoint>
     <test.gogrid.api-version>1.5</test.gogrid.api-version>
     <test.gogrid.build-version />
-    <test.gogrid.identity>FIXME</test.gogrid.identity>
-    <test.gogrid.credential>FIXME</test.gogrid.credential>
+    <test.gogrid.identity>FIXME_IDENTITY</test.gogrid.identity>
+    <test.gogrid.credential>FIXME_CREDENTIAL</test.gogrid.credential>
     <test.gogrid.template />
 
     <jclouds.osgi.export>org.jclouds.gogrid*;version="${project.version}"</jclouds.osgi.export>
diff --git a/providers/hpcloud-blockstorage/pom.xml b/providers/hpcloud-blockstorage/pom.xml
index 890ab3b080..4f7365b857 100644
--- a/providers/hpcloud-blockstorage/pom.xml
+++ b/providers/hpcloud-blockstorage/pom.xml
@@ -35,8 +35,8 @@
     <test.hpcloud-blockstorage.endpoint>https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/</test.hpcloud-blockstorage.endpoint>
     <test.hpcloud-blockstorage.api-version>1.0</test.hpcloud-blockstorage.api-version>
     <test.hpcloud-blockstorage.build-version />
-    <test.hpcloud-blockstorage.identity>FIXME</test.hpcloud-blockstorage.identity>
-    <test.hpcloud-blockstorage.credential>FIXME</test.hpcloud-blockstorage.credential>
+    <test.hpcloud-blockstorage.identity>FIXME_IDENTITY</test.hpcloud-blockstorage.identity>
+    <test.hpcloud-blockstorage.credential>FIXME_CREDENTIAL</test.hpcloud-blockstorage.credential>
     <test.hpcloud-blockstorage.template />
     <jclouds.osgi.export>org.jclouds.hpcloud.blockstorage.*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index f76d2da762..6eb7dbac6b 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -49,8 +49,8 @@
     <test.softlayer.endpoint>https://api.softlayer.com/rest</test.softlayer.endpoint>
     <test.softlayer.api-version>3</test.softlayer.api-version>
     <test.softlayer.build-version />
-    <test.softlayer.identity>FIXME</test.softlayer.identity>
-    <test.softlayer.credential>FIXME</test.softlayer.credential>
+    <test.softlayer.identity>FIXME_IDENTITY</test.softlayer.identity>
+    <test.softlayer.credential>FIXME_CREDENTIAL</test.softlayer.credential>
     <test.softlayer.template />
     <jclouds.osgi.export>org.jclouds.softlayer*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index 95da441ee2..c3fbe6fe45 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -33,11 +33,11 @@
   <properties>
     <!-- when instances are hung, open a ticket and add here -->
     <jclouds.compute.blacklist-nodes>trmkrun-ccc,test.trmk-924</jclouds.compute.blacklist-nodes>
-    <test.servermanager.identity>FIXME</test.servermanager.identity>
+    <test.servermanager.identity>FIXME_IDENTITY</test.servermanager.identity>
+    <test.servermanager.credential>FIXME_CREDENTIAL</test.servermanager.credential>
     <test.servermanager.endpoint>https://servermanager.com</test.servermanager.endpoint>
     <test.servermanager.api-version>1.0</test.servermanager.api-version>
     <test.servermanager.build-version />
-    <test.servermanager.identity>FIXME</test.servermanager.identity>
 
     <jclouds.osgi.export>org.jclouds.servermanager*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>