diff --git a/aws/core/src/test/java/org/jclouds/aws/s3/functions/ReturnFalseOn404OrSSLHandshakeException.java b/aws/core/src/main/java/org/jclouds/aws/s3/functions/ReturnFalseOn404OrSSLHandshakeException.java
similarity index 100%
rename from aws/core/src/test/java/org/jclouds/aws/s3/functions/ReturnFalseOn404OrSSLHandshakeException.java
rename to aws/core/src/main/java/org/jclouds/aws/s3/functions/ReturnFalseOn404OrSSLHandshakeException.java
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
index b07dc00004..32155f2c35 100755
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
@@ -43,6 +43,7 @@ public class BaseContainerIntegrationTest<A, S> extends BaseBlobStoreIntegration
    @Test(groups = { "integration", "live" })
    public void containerDoesntExist() {
       assert !context.getBlobStore().containerExists("forgetaboutit");
+      assert !context.getBlobStore().containerExists("bog.cloudcachestorefunctionalintegrationtest-first");
    }
 
    @Test(groups = { "integration", "live" })