diff --git a/packages/laconia-acceptance-test/acceptance-test/acceptance.spec.js b/packages/laconia-acceptance-test/acceptance-test/acceptance.spec.js
index 71ed1b92..a77fd8e8 100644
--- a/packages/laconia-acceptance-test/acceptance-test/acceptance.spec.js
+++ b/packages/laconia-acceptance-test/acceptance-test/acceptance.spec.js
@@ -19,7 +19,7 @@ const log = v => console.log(v) || v;
 const bucketName = (name, accountId) => log(`${PREFIX}-${accountId}-${name}`);
 const documentClient = new AWS.DynamoDB.DocumentClient();
 
-jest.setTimeout(10000);
+jest.setTimeout(30000);
 
 const Joi = frisby.Joi;
 
diff --git a/packages/laconia-acceptance-test/serverless.yml b/packages/laconia-acceptance-test/serverless.yml
index 9d23f00a..1bc4bf53 100644
--- a/packages/laconia-acceptance-test/serverless.yml
+++ b/packages/laconia-acceptance-test/serverless.yml
@@ -246,9 +246,7 @@ resources:
         KeySchema:
           - AttributeName: "orderId"
             KeyType: "HASH"
-        ProvisionedThroughput:
-          ReadCapacityUnits: 1
-          WriteCapacityUnits: 1
+        BillingMode: PAY_PER_REQUEST
         TableName: ${self:custom.orderDynamoDbBatchTableName}
     ConnectionTable:
       Type: "AWS::DynamoDB::Table"
@@ -259,7 +257,5 @@ resources:
         KeySchema:
           - AttributeName: "connectionId"
             KeyType: "HASH"
-        ProvisionedThroughput:
-          ReadCapacityUnits: 1
-          WriteCapacityUnits: 1
+        BillingMode: PAY_PER_REQUEST
         TableName: ${self:custom.connectionDynamoDbTableName}
diff --git a/packages/laconia-batch/integration-test/dynamodb-batch-handler.spec.js b/packages/laconia-batch/integration-test/dynamodb-batch-handler.spec.js
index 1aea5a99..1b666bb9 100644
--- a/packages/laconia-batch/integration-test/dynamodb-batch-handler.spec.js
+++ b/packages/laconia-batch/integration-test/dynamodb-batch-handler.spec.js
@@ -14,6 +14,8 @@ const AWS_REGION = process.env.AWS_REGION || "eu-west-1";
 AWSMock.setSDKInstance(AWS);
 AWS.config.credentials = new AWS.Credentials("fake", "fake", "fake");
 
+jest.setTimeout(30000);
+
 describe("dynamodb batch handler", () => {
   const dynamoLocalPort = 8000;
   const dynamoDbOptions = {