diff --git a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
index 3366e41097..e95ad5e381 100644
--- a/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
+++ b/apis/cloudfiles/src/test/java/org/jclouds/cloudfiles/blobstore/integration/CloudFilesContainerLiveTest.java
@@ -18,13 +18,13 @@
  */
 package org.jclouds.cloudfiles.blobstore.integration;
 
-import org.jclouds.openstack.swift.blobstore.integration.SwiftContainerLiveTest;
+import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
 import org.testng.annotations.Test;
 
 /**
  * @author Adrian Cole
  */
 @Test(groups = { "live" })
-public class CloudFilesContainerLiveTest extends SwiftContainerLiveTest {
+public class CloudFilesContainerLiveTest extends BaseContainerLiveTest {
 
 }
diff --git a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
index 6f67e4a4f8..16e78ad646 100644
--- a/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
+++ b/providers/cloudfiles-uk/src/test/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKClientLiveTest.java
@@ -18,8 +18,11 @@
  */
 package org.jclouds.rackspace.cloudfiles;
 
+import static org.testng.Assert.assertEquals;
+
 import org.jclouds.cloudfiles.CloudFilesClient;
 import org.jclouds.openstack.swift.CommonSwiftClientLiveTest;
+import org.jclouds.openstack.swift.domain.SwiftObject;
 import org.testng.annotations.Test;
 
 /**
@@ -27,7 +30,7 @@ import org.testng.annotations.Test;
  * 
  * @author Adrian Cole
  */
-@Test(groups = "live", sequential = true, testName = "CloudFilesUKClientLiveTest")
+@Test(groups = "live", singleThreaded = true, testName = "CloudFilesUKClientLiveTest")
 public class CloudFilesUKClientLiveTest extends CommonSwiftClientLiveTest<CloudFilesClient> {
    // NOTE cloudfilesuk doesn't have cdn
 
@@ -35,4 +38,11 @@ public class CloudFilesUKClientLiveTest extends CommonSwiftClientLiveTest<CloudF
    public CloudFilesClient getApi() {
       return (CloudFilesClient) context.getProviderSpecificContext().getApi();
    }
+   
+   @Override
+   protected void testGetObjectContentType(SwiftObject getBlob) {
+      //lovely new bug.. should be text/plain
+      assertEquals(getBlob.getInfo().getContentType(), "application/x-www-form-urlencoded");
+   }
+
 }
diff --git a/providers/cloudservers-us/pom.xml b/providers/cloudservers-us/pom.xml
index 07914f1be4..84cb2e3b51 100644
--- a/providers/cloudservers-us/pom.xml
+++ b/providers/cloudservers-us/pom.xml
@@ -103,6 +103,7 @@
                                     <goal>test</goal>
                                 </goals>
                                 <configuration>
+                                    <threadCount>1</threadCount>
                                     <systemProperties>
                                         <property>
                                             <name>test.cloudservers-us.endpoint</name>