diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 19a98f2..7b88b0d 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
-    <test.byon.sudo-password></test.byon.sudo-password>
+    <test.byon.sudo-password />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/cloudservers/pom.xml b/apis/cloudservers/pom.xml
index 6342b13..9abeb16 100644
--- a/apis/cloudservers/pom.xml
+++ b/apis/cloudservers/pom.xml
@@ -40,9 +40,9 @@
     <test.cloudservers.build-version></test.cloudservers.build-version>
     <test.cloudservers.identity>${test.rackspace.identity}</test.cloudservers.identity>
     <test.cloudservers.credential>${test.rackspace.credential}</test.cloudservers.credential>
-    <test.cloudservers.image-id></test.cloudservers.image-id>
-    <test.cloudservers.image.login-user></test.cloudservers.image.login-user>
-    <test.cloudservers.image.authenticate-sudo></test.cloudservers.image.authenticate-sudo>
+    <test.cloudservers.image-id />
+    <test.cloudservers.image.login-user />
+    <test.cloudservers.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index 4c5626a..090b0e9 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -53,11 +53,11 @@
     <test.cloudstack.build-version></test.cloudstack.build-version>
     <test.cloudstack.identity>FIXME_apiKey</test.cloudstack.identity>
     <test.cloudstack.credential>FIXME_secretKey</test.cloudstack.credential>
-    <test.cloudstack.domainAdminIdentity></test.cloudstack.domainAdminIdentity>
-    <test.cloudstack.domainAdminCredential></test.cloudstack.domainAdminCredential>
-    <test.cloudstack.image-id></test.cloudstack.image-id>
-    <test.cloudstack.image.login-user></test.cloudstack.image.login-user>
-    <test.cloudstack.image.authenticate-sudo></test.cloudstack.image.authenticate-sudo>
+    <test.cloudstack.domainAdminIdentity />
+    <test.cloudstack.domainAdminCredential />
+    <test.cloudstack.image-id />
+    <test.cloudstack.image.login-user />
+    <test.cloudstack.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/deltacloud/pom.xml b/apis/deltacloud/pom.xml
index 476c9ce..7b8e438 100644
--- a/apis/deltacloud/pom.xml
+++ b/apis/deltacloud/pom.xml
@@ -53,9 +53,9 @@
     <test.deltacloud.build-version></test.deltacloud.build-version>
     <test.deltacloud.identity>mockuser</test.deltacloud.identity>
     <test.deltacloud.credential>mockpassword</test.deltacloud.credential>
-    <test.deltacloud.image-id></test.deltacloud.image-id>
-    <test.deltacloud.image.login-user></test.deltacloud.image.login-user>
-    <test.deltacloud.image.authenticate-sudo></test.deltacloud.image.authenticate-sudo>
+    <test.deltacloud.image-id />
+    <test.deltacloud.image.login-user />
+    <test.deltacloud.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index ae171c5..4132100 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -39,9 +39,9 @@
     <test.ec2.build-version></test.ec2.build-version>
     <test.ec2.identity>${test.aws.identity}</test.ec2.identity>
     <test.ec2.credential>${test.aws.credential}</test.ec2.credential>
-    <test.ec2.image-id></test.ec2.image-id>
-    <test.ec2.image.login-user></test.ec2.image.login-user>
-    <test.ec2.image.authenticate-sudo></test.ec2.image.authenticate-sudo>
+    <test.ec2.image-id />
+    <test.ec2.image.login-user />
+    <test.ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/eucalyptus/pom.xml b/apis/eucalyptus/pom.xml
index 272ab50..92dc68f 100644
--- a/apis/eucalyptus/pom.xml
+++ b/apis/eucalyptus/pom.xml
@@ -39,9 +39,9 @@
     <test.eucalyptus.build-version></test.eucalyptus.build-version>
     <test.eucalyptus.identity>FIXME_IDENTITY</test.eucalyptus.identity>
     <test.eucalyptus.credential>FIXME_CREDENTIAL</test.eucalyptus.credential>
-    <test.eucalyptus.image-id></test.eucalyptus.image-id>
-    <test.eucalyptus.image.login-user></test.eucalyptus.image.login-user>
-    <test.eucalyptus.image.authenticate-sudo></test.eucalyptus.image.authenticate-sudo>
+    <test.eucalyptus.image-id />
+    <test.eucalyptus.image.login-user />
+    <test.eucalyptus.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/apis/nova/pom.xml b/apis/nova/pom.xml
index 8699579..e052dec 100644
--- a/apis/nova/pom.xml
+++ b/apis/nova/pom.xml
@@ -39,11 +39,11 @@
     <test.nova.build-version></test.nova.build-version>
     <test.nova.identity>FIXME_IDENTITY</test.nova.identity>
     <test.nova.credential>FIXME_CREDENTIALS</test.nova.credential>
-    <test.nova.image-id></test.nova.image-id>
-    <test.nova.image.login-user></test.nova.image.login-user>
-    <test.nova.image.authenticate-sudo></test.nova.image.authenticate-sudo>
-    <test.ssh.keyfile.public></test.ssh.keyfile.public>
-    <test.ssh.keyfile.private></test.ssh.keyfile.private>
+    <test.nova.image-id />
+    <test.nova.image.login-user />
+    <test.nova.image.authenticate-sudo />
+    <test.ssh.keyfile.public />
+    <test.ssh.keyfile.private />
   </properties>
 
   <dependencies>
diff --git a/apis/vcloud/pom.xml b/apis/vcloud/pom.xml
index 32e42bb..d7a50e9 100644
--- a/apis/vcloud/pom.xml
+++ b/apis/vcloud/pom.xml
@@ -39,9 +39,9 @@
     <test.vcloud.build-version></test.vcloud.build-version>
     <test.vcloud.identity>FIXME</test.vcloud.identity>
     <test.vcloud.credential>FIXME</test.vcloud.credential>
-    <test.vcloud.image-id></test.vcloud.image-id>
-    <test.vcloud.image.login-user></test.vcloud.image.login-user>
-    <test.vcloud.image.authenticate-sudo></test.vcloud.image.authenticate-sudo>
+    <test.vcloud.image-id />
+    <test.vcloud.image.login-user />
+    <test.vcloud.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index 5eefe3d..9328e8d 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -39,9 +39,9 @@
     <test.aws-ec2.build-version></test.aws-ec2.build-version>
     <test.aws-ec2.identity>${test.aws.identity}</test.aws-ec2.identity>
     <test.aws-ec2.credential>${test.aws.credential}</test.aws-ec2.credential>
-    <test.aws-ec2.image-id></test.aws-ec2.image-id>
-    <test.aws-ec2.image.login-user></test.aws-ec2.image.login-user>
-    <test.aws-ec2.image.authenticate-sudo></test.aws-ec2.image.authenticate-sudo>
+    <test.aws-ec2.image-id />
+    <test.aws-ec2.image.login-user />
+    <test.aws-ec2.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/bluelock-vcloud-zone01/pom.xml b/providers/bluelock-vcloud-zone01/pom.xml
index ccf8d2a..8ae52a6 100644
--- a/providers/bluelock-vcloud-zone01/pom.xml
+++ b/providers/bluelock-vcloud-zone01/pom.xml
@@ -39,9 +39,9 @@
     <test.bluelock-vcloud-zone01.build-version></test.bluelock-vcloud-zone01.build-version>
     <test.bluelock-vcloud-zone01.identity>FIXME_IDENTITY</test.bluelock-vcloud-zone01.identity>
     <test.bluelock-vcloud-zone01.credential>FIXME_CREDENTIAL</test.bluelock-vcloud-zone01.credential>
-    <test.bluelock-vcloud-zone01.image-id></test.bluelock-vcloud-zone01.image-id>
-    <test.bluelock-vcloud-zone01.image.login-user></test.bluelock-vcloud-zone01.image.login-user>
-    <test.bluelock-vcloud-zone01.image.authenticate-sudo></test.bluelock-vcloud-zone01.image.authenticate-sudo>
+    <test.bluelock-vcloud-zone01.image-id />
+    <test.bluelock-vcloud-zone01.image.login-user />
+    <test.bluelock-vcloud-zone01.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudservers-uk/pom.xml b/providers/cloudservers-uk/pom.xml
index 4469ea3..f9b32e7 100644
--- a/providers/cloudservers-uk/pom.xml
+++ b/providers/cloudservers-uk/pom.xml
@@ -39,9 +39,9 @@
     <test.cloudservers-uk.build-version></test.cloudservers-uk.build-version>
     <test.cloudservers-uk.identity>${test.rackspace-uk.identity}</test.cloudservers-uk.identity>
     <test.cloudservers-uk.credential>${test.rackspace-uk.credential}</test.cloudservers-uk.credential>
-    <test.cloudservers-uk.image-id></test.cloudservers-uk.image-id>
-    <test.cloudservers-uk.image.login-user></test.cloudservers-uk.image.login-user>
-    <test.cloudservers-uk.image.authenticate-sudo></test.cloudservers-uk.image.authenticate-sudo>
+    <test.cloudservers-uk.image-id />
+    <test.cloudservers-uk.image.login-user />
+    <test.cloudservers-uk.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 33bbf9f..657d41c 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -39,9 +39,9 @@
     <test.cloudservers-us.build-version></test.cloudservers-us.build-version>
     <test.cloudservers-us.identity>${test.rackspace-us.identity}</test.cloudservers-us.identity>
     <test.cloudservers-us.credential>${test.rackspace-us.credential}</test.cloudservers-us.credential>
-    <test.cloudservers-us.image-id></test.cloudservers-us.image-id>
-    <test.cloudservers-us.image.login-user></test.cloudservers-us.image.login-user>
-    <test.cloudservers-us.image.authenticate-sudo></test.cloudservers-us.image.authenticate-sudo>
+    <test.cloudservers-us.image-id />
+    <test.cloudservers-us.image.login-user />
+    <test.cloudservers-us.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-lvs/pom.xml b/providers/cloudsigma-lvs/pom.xml
index 05344a9..c4a66aa 100644
--- a/providers/cloudsigma-lvs/pom.xml
+++ b/providers/cloudsigma-lvs/pom.xml
@@ -39,9 +39,9 @@
     <test.cloudsigma-lvs.build-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.image-id></test.cloudsigma-lvs.image-id>
-    <test.cloudsigma-lvs.image.login-user></test.cloudsigma-lvs.image.login-user>
-    <test.cloudsigma-lvs.image.authenticate-sudo></test.cloudsigma-lvs.image.authenticate-sudo>
+    <test.cloudsigma-lvs.image-id />
+    <test.cloudsigma-lvs.image.login-user />
+    <test.cloudsigma-lvs.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/cloudsigma-zrh/pom.xml b/providers/cloudsigma-zrh/pom.xml
index 937380d..0ef7ab4 100644
--- a/providers/cloudsigma-zrh/pom.xml
+++ b/providers/cloudsigma-zrh/pom.xml
@@ -39,9 +39,9 @@
     <test.cloudsigma-zrh.build-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.image-id></test.cloudsigma-zrh.image-id>
-    <test.cloudsigma-zrh.image.login-user></test.cloudsigma-zrh.image.login-user>
-    <test.cloudsigma-zrh.image.authenticate-sudo></test.cloudsigma-zrh.image.authenticate-sudo>
+    <test.cloudsigma-zrh.image-id />
+    <test.cloudsigma-zrh.image.login-user />
+    <test.cloudsigma-zrh.image.authenticate-sudo />
   </properties>
 
   <dependencies>
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index 226b63f..1c7b6cd 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -39,7 +39,7 @@
         <test.elastichosts-lax-p.build-version></test.elastichosts-lax-p.build-version>
         <test.elastichosts-lax-p.identity>FIXME_IDENTITY</test.elastichosts-lax-p.identity>
         <test.elastichosts-lax-p.credential>FIXME_CREDENTIAL</test.elastichosts-lax-p.credential>
-        <test.elastichosts-lax-p.image-id></test.elastichosts-lax-p.image-id>
+        <test.elastichosts-lax-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 4f8cd50..a0cf832 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -39,7 +39,7 @@
         <test.elastichosts-lon-b.build-version></test.elastichosts-lon-b.build-version>
         <test.elastichosts-lon-b.identity>FIXME_IDENTITY</test.elastichosts-lon-b.identity>
         <test.elastichosts-lon-b.credential>FIXME_CREDENTIAL</test.elastichosts-lon-b.credential>
-        <test.elastichosts-lon-b.image-id></test.elastichosts-lon-b.image-id>
+        <test.elastichosts-lon-b.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index b3399fb..ee5b3d6 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -39,7 +39,7 @@
         <test.elastichosts-lon-p.build-version></test.elastichosts-lon-p.build-version>
         <test.elastichosts-lon-p.identity>FIXME_IDENTITY</test.elastichosts-lon-p.identity>
         <test.elastichosts-lon-p.credential>FIXME_CREDENTIAL</test.elastichosts-lon-p.credential>
-        <test.elastichosts-lon-p.image-id></test.elastichosts-lon-p.image-id>
+        <test.elastichosts-lon-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index fbc6091..47e5f04 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -39,7 +39,7 @@
         <test.elastichosts-sat-p.build-version></test.elastichosts-sat-p.build-version>
         <test.elastichosts-sat-p.identity>FIXME_IDENTITY</test.elastichosts-sat-p.identity>
         <test.elastichosts-sat-p.credential>FIXME_CREDENTIAL</test.elastichosts-sat-p.credential>
-        <test.elastichosts-sat-p.image-id></test.elastichosts-sat-p.image-id>
+        <test.elastichosts-sat-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index 63dddbc..264d821 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -39,7 +39,7 @@
         <test.elastichosts-tor-p.build-version></test.elastichosts-tor-p.build-version>
         <test.elastichosts-tor-p.identity>FIXME_IDENTITY</test.elastichosts-tor-p.identity>
         <test.elastichosts-tor-p.credential>FIXME_CREDENTIAL</test.elastichosts-tor-p.credential>
-        <test.elastichosts-tor-p.image-id></test.elastichosts-tor-p.image-id>
+        <test.elastichosts-tor-p.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/eucalyptus-partnercloud-ec2/pom.xml b/providers/eucalyptus-partnercloud-ec2/pom.xml
index aa65433..e963fda 100644
--- a/providers/eucalyptus-partnercloud-ec2/pom.xml
+++ b/providers/eucalyptus-partnercloud-ec2/pom.xml
@@ -39,7 +39,7 @@
         <test.eucalyptus-partnercloud-ec2.build-version></test.eucalyptus-partnercloud-ec2.build-version>
         <test.eucalyptus-partnercloud-ec2.identity>FIXME_IDENTITY</test.eucalyptus-partnercloud-ec2.identity>
         <test.eucalyptus-partnercloud-ec2.credential>FIXME_CREDENTIAL</test.eucalyptus-partnercloud-ec2.credential>
-        <test.eucalyptus-partnercloud-ec2.image-id></test.eucalyptus-partnercloud-ec2.image-id>
+        <test.eucalyptus-partnercloud-ec2.image-id />
         <!--  corresponds to image manifest and also virt + "-cluster" zone -->
         <test.eucalyptus-partnercloud-ec2.virtualization-type>kvm</test.eucalyptus-partnercloud-ec2.virtualization-type>
     </properties>
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index a188534..4efa579 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -39,7 +39,7 @@
         <test.go2cloud-jhb1.build-version></test.go2cloud-jhb1.build-version>
         <test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>
         <test.go2cloud-jhb1.credential>FIXME_CREDENTIAL</test.go2cloud-jhb1.credential>
-        <test.go2cloud-jhb1.image-id></test.go2cloud-jhb1.image-id>
+        <test.go2cloud-jhb1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index 8c4f6b1..cac7385 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -39,7 +39,7 @@
         <test.gogrid.build-version></test.gogrid.build-version>
         <test.gogrid.identity>FIXME</test.gogrid.identity>
         <test.gogrid.credential>FIXME</test.gogrid.credential>
-        <test.gogrid.image-id></test.gogrid.image-id>
+        <test.gogrid.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/greenhousedata-element-vcloud/pom.xml b/providers/greenhousedata-element-vcloud/pom.xml
index bfa5dbd..8b9c4d1 100644
--- a/providers/greenhousedata-element-vcloud/pom.xml
+++ b/providers/greenhousedata-element-vcloud/pom.xml
@@ -39,7 +39,7 @@
         <test.greenhousedata-element-vcloud.build-version></test.greenhousedata-element-vcloud.build-version>
         <test.greenhousedata-element-vcloud.identity>FIXME_IDENTITY</test.greenhousedata-element-vcloud.identity>
         <test.greenhousedata-element-vcloud.credential>FIXME_CREDENTIAL</test.greenhousedata-element-vcloud.credential>
-        <test.greenhousedata-element-vcloud.image-id></test.greenhousedata-element-vcloud.image-id>
+        <test.greenhousedata-element-vcloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index d560257..8abd04a 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -39,7 +39,7 @@
         <test.openhosting-east1.build-version></test.openhosting-east1.build-version>
         <test.openhosting-east1.identity>FIXME_IDENTITY</test.openhosting-east1.identity>
         <test.openhosting-east1.credential>FIXME_CREDENTIAL</test.openhosting-east1.credential>
-        <test.openhosting-east1.image-id></test.openhosting-east1.image-id>
+        <test.openhosting-east1.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/rimuhosting/pom.xml b/providers/rimuhosting/pom.xml
index 9fd412d..07e2d84 100644
--- a/providers/rimuhosting/pom.xml
+++ b/providers/rimuhosting/pom.xml
@@ -38,7 +38,7 @@
         <test.rimuhosting.api-version>1.0</test.rimuhosting.api-version>
         <test.rimuhosting.build-version></test.rimuhosting.build-version>
         <test.rimuhosting.identity>FIXME</test.rimuhosting.identity>
-        <test.rimuhosting.image-id></test.rimuhosting.image-id>
+        <test.rimuhosting.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/savvis-symphonyvpdc/pom.xml b/providers/savvis-symphonyvpdc/pom.xml
index 5bab196..2a74762 100644
--- a/providers/savvis-symphonyvpdc/pom.xml
+++ b/providers/savvis-symphonyvpdc/pom.xml
@@ -53,7 +53,7 @@
         <test.savvis-symphonyvpdc.build-version></test.savvis-symphonyvpdc.build-version>
         <test.savvis-symphonyvpdc.identity>FIXME</test.savvis-symphonyvpdc.identity>
         <test.savvis-symphonyvpdc.credential>FIXME</test.savvis-symphonyvpdc.credential>
-        <test.savvis-symphonyvpdc.image-id></test.savvis-symphonyvpdc.image-id>
+        <test.savvis-symphonyvpdc.image-id />
         <test.savvis-symphonyvpdc.vdc-email>FIXME</test.savvis-symphonyvpdc.vdc-email>
         <test.savvis-symphonyvpdc.loginUser>FIXME</test.savvis-symphonyvpdc.loginUser>
         <test.savvis-symphonyvpdc.loginPassword>FIXME</test.savvis-symphonyvpdc.loginPassword>
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index 25cfd13..9de7ece 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -39,7 +39,7 @@
         <test.serverlove-z1-man.build-version></test.serverlove-z1-man.build-version>
         <test.serverlove-z1-man.identity>FIXME_IDENTITY</test.serverlove-z1-man.identity>
         <test.serverlove-z1-man.credential>FIXME_CREDENTIAL</test.serverlove-z1-man.credential>
-        <test.serverlove-z1-man.image-id></test.serverlove-z1-man.image-id>
+        <test.serverlove-z1-man.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index d63a715..915903c 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -39,7 +39,7 @@
         <test.skalicloud-sdg-my.build-version></test.skalicloud-sdg-my.build-version>
         <test.skalicloud-sdg-my.identity>FIXME_IDENTITY</test.skalicloud-sdg-my.identity>
         <test.skalicloud-sdg-my.credential>FIXME_CREDENTIAL</test.skalicloud-sdg-my.credential>
-        <test.skalicloud-sdg-my.image-id></test.skalicloud-sdg-my.image-id>
+        <test.skalicloud-sdg-my.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/slicehost/pom.xml b/providers/slicehost/pom.xml
index 82e2827..6aa49fc 100644
--- a/providers/slicehost/pom.xml
+++ b/providers/slicehost/pom.xml
@@ -38,7 +38,7 @@
         <test.slicehost.api-version>1.4.1.1</test.slicehost.api-version>
         <test.slicehost.build-version></test.slicehost.build-version>
         <test.slicehost.identity>FIXME</test.slicehost.identity>
-        <test.slicehost.image-id></test.slicehost.image-id>
+        <test.slicehost.image-id />
     </properties>
     <dependencies>
         <dependency>
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index b60caf5..d1c2f73 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -53,9 +53,9 @@
     <test.softlayer.build-version></test.softlayer.build-version>
     <test.softlayer.identity>FIXME</test.softlayer.identity>
     <test.softlayer.credential>FIXME</test.softlayer.credential>
-    <test.softlayer.image-id></test.softlayer.image-id>
-    <test.softlayer.image.login-user></test.softlayer.image.login-user>
-    <test.softlayer.image.authenticate-sudo></test.softlayer.image.authenticate-sudo>
+    <test.softlayer.image-id />
+    <test.softlayer.image.login-user />
+    <test.softlayer.image.authenticate-sudo />
   </properties>
   <dependencies>
     <dependency>
diff --git a/providers/stratogen-vcloud-mycloud/pom.xml b/providers/stratogen-vcloud-mycloud/pom.xml
index 39e17a8..e354845 100644
--- a/providers/stratogen-vcloud-mycloud/pom.xml
+++ b/providers/stratogen-vcloud-mycloud/pom.xml
@@ -39,7 +39,7 @@
         <test.stratogen-vcloud-mycloud.build-version></test.stratogen-vcloud-mycloud.build-version>
         <test.stratogen-vcloud-mycloud.identity>FIXME_IDENTITY</test.stratogen-vcloud-mycloud.identity>
         <test.stratogen-vcloud-mycloud.credential>FIXME_CREDENTIAL</test.stratogen-vcloud-mycloud.credential>
-        <test.stratogen-vcloud-mycloud.image-id></test.stratogen-vcloud-mycloud.image-id>
+        <test.stratogen-vcloud-mycloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trmk-ecloud/pom.xml b/providers/trmk-ecloud/pom.xml
index b50ba6b..517aadb 100644
--- a/providers/trmk-ecloud/pom.xml
+++ b/providers/trmk-ecloud/pom.xml
@@ -40,7 +40,7 @@
         <test.trmk-ecloud.build-version></test.trmk-ecloud.build-version>
         <test.trmk-ecloud.identity>FIXME</test.trmk-ecloud.identity>
         <test.trmk-ecloud.credential>FIXME</test.trmk-ecloud.credential>
-        <test.trmk-ecloud.image-id></test.trmk-ecloud.image-id>
+        <test.trmk-ecloud.image-id />
     </properties>
 
     <dependencies>
diff --git a/providers/trmk-vcloudexpress/pom.xml b/providers/trmk-vcloudexpress/pom.xml
index 18835cd..13ca895 100644
--- a/providers/trmk-vcloudexpress/pom.xml
+++ b/providers/trmk-vcloudexpress/pom.xml
@@ -39,7 +39,7 @@
         <test.trmk-vcloudexpress.build-version></test.trmk-vcloudexpress.build-version>
         <test.trmk-vcloudexpress.identity>FIXME</test.trmk-vcloudexpress.identity>
         <test.trmk-vcloudexpress.credential>FIXME</test.trmk-vcloudexpress.credential>
-        <test.trmk-vcloudexpress.image-id></test.trmk-vcloudexpress.image-id>
+        <test.trmk-vcloudexpress.image-id />
     </properties>
 
     <dependencies>