diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
index 9d6b43a625..05cba0b62a 100644
--- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
+++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BaseJCloudsPerformanceLiveTest.java
@@ -83,7 +83,7 @@ public abstract class BaseJCloudsPerformanceLiveTest extends BasePerformanceLive
       S3Object object = newObject(key);
       object.getMetadata().setContentType(contentType);
       object.setData(data);
-      object.getMetadata().setSize(new Long(data.available()));
+      object.setContentLength(new Long(data.available()));
       return context.getApi().putObject(bucket, object).get(120, TimeUnit.SECONDS) != null;
    }
 
diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java
index f6cc12e694..b1c1f05222 100755
--- a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java
+++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/BasePerformanceLiveTest.java
@@ -52,7 +52,10 @@ import org.testng.annotations.Test;
  * @author Adrian Cole
  */
 public abstract class BasePerformanceLiveTest extends BaseBlobStoreIntegrationTest<S3Client> {
-   protected int timeoutSeconds = 10;
+   static {
+      containerCount = 1;
+   }
+   protected int timeoutSeconds = 15;
    protected int loopCount = 100;
    protected ExecutorService exec;
    protected CompletionService<Boolean> completer;