diff --git a/src/dynamodb.js b/src/dynamodb.js
index <HASH>..<HASH> 100644
--- a/src/dynamodb.js
+++ b/src/dynamodb.js
@@ -143,10 +143,10 @@ exports.useDynamoDB = (test, useUniqueTables = false) => {
     await createTables(service, uniqueIdentifier);
   });
 
-  test.always.afterEach(async test => {
+  test.afterEach.always(async test => {
     const {dynamoClient, uniqueIdentifier} = test.context.dynamodb;
     await destroyTables(dynamoClient, uniqueIdentifier);
   });
 
-  test.always.after(test => connection.cleanup());
+  test.after.always(test => connection.cleanup());
 };
diff --git a/src/lambda.js b/src/lambda.js
index <HASH>..<HASH> 100644
--- a/src/lambda.js
+++ b/src/lambda.js
@@ -174,7 +174,7 @@ exports.useLambda = (test, localOptions = {}) => {
     }
   });
 
-  test.always.after(async (test) => {
+  test.after.always(async (test) => {
     await destroyLambdaExecutionEnvironment(executionEnvironment);
   });
Add support for ava <I> api, new way is supported in previous versions as well