diff --git a/aws/core/src/main/java/org/jclouds/aws/filters/FormSigner.java b/aws/core/src/main/java/org/jclouds/aws/filters/FormSigner.java
index d569bbad7c..698fb87695 100755
--- a/aws/core/src/main/java/org/jclouds/aws/filters/FormSigner.java
+++ b/aws/core/src/main/java/org/jclouds/aws/filters/FormSigner.java
@@ -99,6 +99,7 @@ public class FormSigner implements HttpRequestFilter, RequestSigner {
                "request is not ready to sign; host not present");
       Multimap<String, String> decodedParams = RestAnnotationProcessor.parseQueryToMap(request
                .getPayload().getRawContent().toString());
+      request.getHeaders().removeAll(HttpHeaders.CONTENT_LENGTH);
       addSigningParams(decodedParams);
       validateParams(decodedParams);
       String stringToSign = createStringToSign(request, decodedParams);
diff --git a/aws/demos/googleappengine/pom.xml b/aws/demos/googleappengine/pom.xml
index 4f191ded92..dedfc4317e 100644
--- a/aws/demos/googleappengine/pom.xml
+++ b/aws/demos/googleappengine/pom.xml
@@ -38,7 +38,7 @@
             extraction of appengine-java-sdk
         -->
         <appengine.home>YOUR_APPENGINE_HOME</appengine.home>
-        <appengine.applicationid>jclouds-s3-example</appengine.applicationid>
+        <appengine.applicationid>jclouds-aws-demo</appengine.applicationid>
         <devappserver.address>localhost</devappserver.address>
         <devappserver.port>8088</devappserver.port>
     </properties>
diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
index fe6d6e17da..6f06ea8c54 100755
--- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
+++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java
@@ -54,7 +54,7 @@ public class GoogleDevServer {
 
         });
         server.start();
-        Thread.sleep(10 * 1000);
+        Thread.sleep(15 * 1000);
     }
 
     @SuppressWarnings("deprecation")