diff --git a/aws/s3/perftest/pom.xml b/aws/s3/perftest/pom.xml
index 6432049434..037a1045e2 100644
--- a/aws/s3/perftest/pom.xml
+++ b/aws/s3/perftest/pom.xml
@@ -72,6 +72,44 @@
 			<artifactId>jclouds-httpnio</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+	    <dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jclouds-gae</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+<!-- start gae dependencies -->
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-stubs</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-local-runtime</artifactId>
+            <version>1.2.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jclouds-core</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
+<!-- end gae dependencies -->
 		<dependency>
 			<groupId>net.java.dev.jets3t</groupId>
 			<artifactId>jets3t</artifactId>
diff --git a/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java
new file mode 100644
index 0000000000..e5322b4df2
--- /dev/null
+++ b/aws/s3/perftest/src/test/java/org/jclouds/aws/s3/JCloudsGaePerformanceLiveTest.java
@@ -0,0 +1,122 @@
+/**
+ *
+ * Copyright (C) 2009 Global Cloud Specialists, Inc. <info@globalcloudspecialists.com>
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ */
+package org.jclouds.aws.s3;
+
+import java.io.File;
+import java.io.InputStream;
+
+import org.jclouds.gae.config.URLFetchServiceClientModule;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.appengine.tools.development.ApiProxyLocalImpl;
+import com.google.apphosting.api.ApiProxy;
+import com.google.inject.Module;
+
+@Test(sequential = true, testName = "s3.JCloudsGaePerformanceLiveTest", groups = { "live" })
+public class JCloudsGaePerformanceLiveTest extends BaseJCloudsPerformance {
+
+   @Override
+   protected boolean putByteArray(String bucket, String key, byte[] data, String contentType)
+            throws Exception {
+      setupApiProxy();
+      return super.putByteArray(bucket, key, data, contentType);
+   }
+
+   @Override
+   protected boolean putFile(String bucket, String key, File data, String contentType)
+            throws Exception {
+      setupApiProxy();
+      return super.putFile(bucket, key, data, contentType);
+   }
+
+   @Override
+   protected boolean putInputStream(String bucket, String key, InputStream data, String contentType)
+            throws Exception {
+      setupApiProxy();
+      return super.putInputStream(bucket, key, data, contentType);
+   }
+
+   @Override
+   protected boolean putString(String bucket, String key, String data, String contentType)
+            throws Exception {
+      setupApiProxy();
+      return super.putString(bucket, key, data, contentType);
+   }
+
+   @Override
+   protected void deleteEverything() throws Exception {
+      setupApiProxy();
+      super.deleteEverything();
+   }
+
+   @BeforeMethod
+   void setupApiProxy() {
+      ApiProxy.setEnvironmentForCurrentThread(new TestEnvironment());
+      ApiProxy.setDelegate(new ApiProxyLocalImpl(new File(".")) {
+      });
+   }
+
+   class TestEnvironment implements ApiProxy.Environment {
+      public String getAppId() {
+         return "Unit Tests";
+      }
+
+      public String getVersionId() {
+         return "1.0";
+      }
+
+      public void setDefaultNamespace(String s) {
+      }
+
+      public String getRequestNamespace() {
+         return null;
+      }
+
+      public String getDefaultNamespace() {
+         return null;
+      }
+
+      public String getAuthDomain() {
+         return null;
+      }
+
+      public boolean isLoggedIn() {
+         return false;
+      }
+
+      public String getEmail() {
+         return null;
+      }
+
+      public boolean isAdmin() {
+         return false;
+      }
+   }
+
+   @Override
+   protected Module createHttpModule() {
+      return new URLFetchServiceClientModule();
+   }
+}
\ No newline at end of file