diff --git a/aws/s3/extensions/pom.xml b/aws/s3/extensions/pom.xml
index 2a119adfb0..3142baff76 100644
--- a/aws/s3/extensions/pom.xml
+++ b/aws/s3/extensions/pom.xml
@@ -52,13 +52,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.2</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
 </project>
diff --git a/aws/s3/perftest/pom.xml b/aws/s3/perftest/pom.xml
index da2c0c02a7..9f70602a79 100644
--- a/aws/s3/perftest/pom.xml
+++ b/aws/s3/perftest/pom.xml
@@ -60,12 +60,6 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<version>1.2</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>jclouds-httpnio</artifactId>
@@ -135,8 +129,10 @@
             </goals>
             <configuration>
           <!-- to keep garbage from previous tests from affecting the performance of the next -->
+<!--
           <forkMode>pertest</forkMode>
               <parallel>classes</parallel>
+-->
               <threadCount>1</threadCount>
             </configuration>
           </execution>
diff --git a/aws/s3/samples/pom.xml b/aws/s3/samples/pom.xml
index fa65eaa05d..4236b036fb 100644
--- a/aws/s3/samples/pom.xml
+++ b/aws/s3/samples/pom.xml
@@ -54,11 +54,5 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.2</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/azure/storage/blob/pom.xml b/azure/storage/blob/pom.xml
index 697327b5f2..2aa0175a68 100644
--- a/azure/storage/blob/pom.xml
+++ b/azure/storage/blob/pom.xml
@@ -40,7 +40,7 @@
         <module>core</module>
     </modules>
     <properties>
-        <jclouds.test.initializer>org.jclouds.azure.storage.blob.integration.AzureBlobTestInitializer</jclouds.test.initializer>
+        <jclouds.test.initializer>org.jclouds.azure.storage.blob.blobstore.integration.AzureBlobTestInitializer</jclouds.test.initializer>
     </properties>
     <dependencies>
         <dependency>