diff --git a/src/dynamic-import/catch/nested-arrow.template b/src/dynamic-import/catch/nested-arrow.template
index 3ab6ad391bc053697efa554a40c71eba0be7cf49..736fd0b8b1d9e46dbcaead49a903287a01c46a9a 100644
--- a/src/dynamic-import/catch/nested-arrow.template
+++ b/src/dynamic-import/catch/nested-arrow.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let f = () => {
diff --git a/src/dynamic-import/catch/nested-async-function-await.template b/src/dynamic-import/catch/nested-async-function-await.template
index dad59da0fb8fb46d566afedd175d7fd38fc5143b..ac4a21887ea666f2720c831800d25f2b7f4996f5 100644
--- a/src/dynamic-import/catch/nested-async-function-await.template
+++ b/src/dynamic-import/catch/nested-async-function-await.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/catch/nested-async-function-return-await.template b/src/dynamic-import/catch/nested-async-function-return-await.template
index 6a1db187189c3e4002c35be83fafc2bf36982af4..898841aa95e0f0b2acdd8e6b2a51361c3e03232c 100644
--- a/src/dynamic-import/catch/nested-async-function-return-await.template
+++ b/src/dynamic-import/catch/nested-async-function-return-await.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/catch/nested-async-function.template b/src/dynamic-import/catch/nested-async-function.template
index 89a35cd67955ab012f3e6e1c52859d62e8b6c868..a9dffd4e188c56f86c276287655c8cd8d2bd6760 100644
--- a/src/dynamic-import/catch/nested-async-function.template
+++ b/src/dynamic-import/catch/nested-async-function.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/catch/nested-block-labeled.template b/src/dynamic-import/catch/nested-block-labeled.template
index c899f4462c0ccf2689cec2b9d5adfae97173918f..5ffedebf977c3351a091f25eb77ae0ca3018710e 100644
--- a/src/dynamic-import/catch/nested-block-labeled.template
+++ b/src/dynamic-import/catch/nested-block-labeled.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 label: {
diff --git a/src/dynamic-import/catch/nested-block.template b/src/dynamic-import/catch/nested-block.template
index f8bf9e7d958f64098f4346897b144a6f09a80059..0f2ab3877abeb9261e65ace3bce4c5b3e16a8930 100644
--- a/src/dynamic-import/catch/nested-block.template
+++ b/src/dynamic-import/catch/nested-block.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 {
diff --git a/src/dynamic-import/catch/nested-do-while.template b/src/dynamic-import/catch/nested-do-while.template
index db9d89b553f9687c0eb43c5c8517dc16b3cc9bf6..3e35874d1905e744ef1ba232a273ec7341d05caa 100644
--- a/src/dynamic-import/catch/nested-do-while.template
+++ b/src/dynamic-import/catch/nested-do-while.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 do {
diff --git a/src/dynamic-import/catch/nested-do.template b/src/dynamic-import/catch/nested-do.template
index 4445292afdf4d43e7185130b9513a6976d5c78e2..6ecc6d1968645d6d39b5e6187e6c90d8b5d2b54c 100644
--- a/src/dynamic-import/catch/nested-do.template
+++ b/src/dynamic-import/catch/nested-do.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let x = 0;
diff --git a/src/dynamic-import/catch/nested-else.template b/src/dynamic-import/catch/nested-else.template
index 2768d2b759a7506daba9e37902c90707a4fa8390..c8c2f4d7a124a09f557eac4a99e8d40dc2f129ce 100644
--- a/src/dynamic-import/catch/nested-else.template
+++ b/src/dynamic-import/catch/nested-else.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 if (false) {
diff --git a/src/dynamic-import/catch/nested-function.template b/src/dynamic-import/catch/nested-function.template
index 5cd6bc2cdcb5f42fbd301cfb6a154e066001cb97..f39cf19cb400a6d80a48cc3c9ec4074cbc341427 100644
--- a/src/dynamic-import/catch/nested-function.template
+++ b/src/dynamic-import/catch/nested-function.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 function f() {
diff --git a/src/dynamic-import/catch/nested-if.template b/src/dynamic-import/catch/nested-if.template
index 2c4ec85b59e0837babb98fb30785b50f2273533d..e10e3126826f7838f9518e751805ccdb9aed2338 100644
--- a/src/dynamic-import/catch/nested-if.template
+++ b/src/dynamic-import/catch/nested-if.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 if (true) {
diff --git a/src/dynamic-import/catch/nested-labeled-block.template b/src/dynamic-import/catch/nested-labeled-block.template
index ce843b03db9087dd8c71a372a69a22bc6549775e..fc4cd663cd0f09788f8065dcea1fabb5a2dd5347 100644
--- a/src/dynamic-import/catch/nested-labeled-block.template
+++ b/src/dynamic-import/catch/nested-labeled-block.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 {
diff --git a/src/dynamic-import/catch/nested-while.template b/src/dynamic-import/catch/nested-while.template
index 6a92083e8c4b70ffdf3eb71defc13b7e67370adf..95167098c3f1f7d79178bc2f7c38654e528e73b5 100644
--- a/src/dynamic-import/catch/nested-while.template
+++ b/src/dynamic-import/catch/nested-while.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let x = 0;
diff --git a/src/dynamic-import/catch/top-level.template b/src/dynamic-import/catch/top-level.template
index 16a3ff44b46882027431cccd23eee41a3b24d9c6..ec7d54e1f16eab8e363849c3e866e50b4970124a 100644
--- a/src/dynamic-import/catch/top-level.template
+++ b/src/dynamic-import/catch/top-level.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 import(/*{ params }*/).catch(error => {
diff --git a/src/dynamic-import/default/nested-arrow-assignment-expression.template b/src/dynamic-import/default/nested-arrow-assignment-expression.template
index 62fe62ec8e838b192b58d3b0566f1a28f0149cef..554c730eff0570030396bf1e026f652251470811 100644
--- a/src/dynamic-import/default/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/default/nested-arrow-assignment-expression.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let f = () => import(/*{ params }*/).then(imported => {
diff --git a/src/dynamic-import/default/nested-arrow.template b/src/dynamic-import/default/nested-arrow.template
index fc58f3adb9941cd7836a0b5a0d6e34862f3b7797..b14d661b26cfe0b393c5d77dbe6755c8d9ca7bac 100644
--- a/src/dynamic-import/default/nested-arrow.template
+++ b/src/dynamic-import/default/nested-arrow.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let f = () => {
diff --git a/src/dynamic-import/default/nested-async-function-await.template b/src/dynamic-import/default/nested-async-function-await.template
index bf96a468518fdd2c93babccd36d7ab35a6f73e64..ba361b84494253260179b1329b0e63423c410ff2 100644
--- a/src/dynamic-import/default/nested-async-function-await.template
+++ b/src/dynamic-import/default/nested-async-function-await.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/default/nested-async-function-return-await.template b/src/dynamic-import/default/nested-async-function-return-await.template
index fb0d272d44e59108dc8f0055f0ce70db3d17f03a..80d5ecd51bd492ac2747a954e8bcfb7a5cd02460 100644
--- a/src/dynamic-import/default/nested-async-function-return-await.template
+++ b/src/dynamic-import/default/nested-async-function-return-await.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/default/nested-async-function.template b/src/dynamic-import/default/nested-async-function.template
index 944cc0b1e9e56ad212c5aad798a093dd7cc86b2c..410b4f2edc1327c7f88574dc7f3cda3750546be0 100644
--- a/src/dynamic-import/default/nested-async-function.template
+++ b/src/dynamic-import/default/nested-async-function.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 async function f() {
diff --git a/src/dynamic-import/default/nested-block-labeled.template b/src/dynamic-import/default/nested-block-labeled.template
index 3700b94d4f9ed3faaad23ee563a1a6ef79df801e..d40583d8cbfdc50d002f17f3970d6e2b2ffe0ca5 100644
--- a/src/dynamic-import/default/nested-block-labeled.template
+++ b/src/dynamic-import/default/nested-block-labeled.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 label: {
diff --git a/src/dynamic-import/default/nested-block.template b/src/dynamic-import/default/nested-block.template
index 98c72d83a3298e8c0ae617840010545e5c027aee..a5351812f49c35572ad3a7b2122d15abc11c8464 100644
--- a/src/dynamic-import/default/nested-block.template
+++ b/src/dynamic-import/default/nested-block.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 {
diff --git a/src/dynamic-import/default/nested-do-while.template b/src/dynamic-import/default/nested-do-while.template
index 05e2af8125d3d754b4bcd4bde365d24eb1b2cae5..f0130ad81862cbe8c55e5621cc58408d87e2adc4 100644
--- a/src/dynamic-import/default/nested-do-while.template
+++ b/src/dynamic-import/default/nested-do-while.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 do {
diff --git a/src/dynamic-import/default/nested-do.template b/src/dynamic-import/default/nested-do.template
index 51716eca106da5c6ea704cbc542fd5886906b8bf..8bf4daa59c4764a69bee29a9b3fe0e0bbdefea8b 100644
--- a/src/dynamic-import/default/nested-do.template
+++ b/src/dynamic-import/default/nested-do.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let x = 0;
diff --git a/src/dynamic-import/default/nested-else.template b/src/dynamic-import/default/nested-else.template
index 4e5f81fc06a04f300a615301b5518fbb80b37f2b..3088603d31752c61777add6a406718f7e12bec22 100644
--- a/src/dynamic-import/default/nested-else.template
+++ b/src/dynamic-import/default/nested-else.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 if (false) {
diff --git a/src/dynamic-import/default/nested-function.template b/src/dynamic-import/default/nested-function.template
index 05a358ce7a92ecd4b43f89f9b2ccf3ab399b779b..b03f2d62cdbedb61a4e7640e4b171b198e2e7f9e 100644
--- a/src/dynamic-import/default/nested-function.template
+++ b/src/dynamic-import/default/nested-function.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 function f() {
diff --git a/src/dynamic-import/default/nested-if-braceless.template b/src/dynamic-import/default/nested-if-braceless.template
index c960b59fab8b8b2b647c250c8525b929731921a9..87921a8797da4c6d4287e578f7d0bfb1ffbc9a2f 100644
--- a/src/dynamic-import/default/nested-if-braceless.template
+++ b/src/dynamic-import/default/nested-if-braceless.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 if (true) import(/*{ params }*/);
diff --git a/src/dynamic-import/default/nested-if.template b/src/dynamic-import/default/nested-if.template
index f51d7011bf841c9a4c0c203392a569d4d4ad5f26..7b7f5a7ca206c7a9c272753d6f66aff63fc86b94 100644
--- a/src/dynamic-import/default/nested-if.template
+++ b/src/dynamic-import/default/nested-if.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 if (true) {
diff --git a/src/dynamic-import/default/nested-labeled-block.template b/src/dynamic-import/default/nested-labeled-block.template
index 25fb9c7d98564c8da754e831aa64541846b2ddf8..4ca4b21ee54ad750b7fe35111f0b12d314376d52 100644
--- a/src/dynamic-import/default/nested-labeled-block.template
+++ b/src/dynamic-import/default/nested-labeled-block.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 {
diff --git a/src/dynamic-import/default/nested-while.template b/src/dynamic-import/default/nested-while.template
index 1ec04ce91ff6142e20dcb0ce661f2ba709b4f38c..469640edd3262193736b835b363b64d6547529f5 100644
--- a/src/dynamic-import/default/nested-while.template
+++ b/src/dynamic-import/default/nested-while.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 let x = 0;
diff --git a/src/dynamic-import/default/top-level.template b/src/dynamic-import/default/top-level.template
index 764e714b649e9f6f061db7575c8a4a293f8eaac8..3ab2f0fb66b8b738b539349c3b144316842c60b1 100644
--- a/src/dynamic-import/default/top-level.template
+++ b/src/dynamic-import/default/top-level.template
@@ -21,6 +21,7 @@ info: |
 
 
 features: [dynamic-import]
+flags: [async]
 ---*/
 
 import(/*{ params }*/).then(imported => {
diff --git a/src/dynamic-import/eval-gtbdng-indirect-update-as.case b/src/dynamic-import/eval-gtbdng-indirect-update-as.case
index d06375585548d83eab0fdd888821e282e70179b1..2b9d5d12e3710ef18071ff70e3505113b9ef6698 100644
--- a/src/dynamic-import/eval-gtbdng-indirect-update-as.case
+++ b/src/dynamic-import/eval-gtbdng-indirect-update-as.case
@@ -18,7 +18,6 @@ info: |
        e. Return ? targetER.GetBindingValue(N2, S).
 includes: [fnGlobalObject.js]
 template: default
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/eval-gtbdng-indirect-update-dflt.case b/src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
index 056e8e45ba39175f584e86d414598850e60d1e98..ae7310a5b01271a33cfbb8c12c7f0fc7b2ed04dc 100644
--- a/src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
+++ b/src/dynamic-import/eval-gtbdng-indirect-update-dflt.case
@@ -18,7 +18,6 @@ info: |
        e. Return ? targetER.GetBindingValue(N2, S).
 
 template: default
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/eval-gtbndng-indirect-update.case b/src/dynamic-import/eval-gtbndng-indirect-update.case
index c6862d3b76de7b684445c00ff0dd73c709bf68fa..030b53291411bbd0dec4804f93d59491d9930322 100644
--- a/src/dynamic-import/eval-gtbndng-indirect-update.case
+++ b/src/dynamic-import/eval-gtbndng-indirect-update.case
@@ -19,7 +19,6 @@ info: |
        e. Return ? targetER.GetBindingValue(N2, S).
 includes: [fnGlobalObject.js]
 template: default
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/eval-rqstd-abrupt-typeerror.case b/src/dynamic-import/eval-rqstd-abrupt-typeerror.case
index 0629d59929044b5f1fde18e98e7051d9ab0b85ad..371b0d680043e44f62cf600c964cdea89fc27efe 100644
--- a/src/dynamic-import/eval-rqstd-abrupt-typeerror.case
+++ b/src/dynamic-import/eval-rqstd-abrupt-typeerror.case
@@ -12,7 +12,6 @@ info: |
        a. Let requiredModule be ? HostResolveImportedModule(module, required).
        b. Perform ? requiredModule.ModuleEvaluation().
 template: catch
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/eval-rqstd-abrupt-urierror.case b/src/dynamic-import/eval-rqstd-abrupt-urierror.case
index 1930388b55e6bdc57b3bc215f259dca81101cd6d..bff657b556e0e30203c8cce0c76a5ac740a9d365 100644
--- a/src/dynamic-import/eval-rqstd-abrupt-urierror.case
+++ b/src/dynamic-import/eval-rqstd-abrupt-urierror.case
@@ -12,7 +12,6 @@ info: |
        a. Let requiredModule be ? HostResolveImportedModule(module, required).
        b. Perform ? requiredModule.ModuleEvaluation().
 template: catch
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/instn-iee-err-ambiguous-import.case b/src/dynamic-import/instn-iee-err-ambiguous-import.case
index 415643b95679ba4111cff943aa7ac325f841b0ea..3a2c286b65e11daca515fb8e2ddb603c90f2fddb 100644
--- a/src/dynamic-import/instn-iee-err-ambiguous-import.case
+++ b/src/dynamic-import/instn-iee-err-ambiguous-import.case
@@ -32,7 +32,6 @@ info: |
                   SameValue(resolution.[[BindingName]],
                   starResolution.[[BindingName]]) is false, return "ambiguous".
 template: catch
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/instn-iee-err-circular.case b/src/dynamic-import/instn-iee-err-circular.case
index 61d5ddbdabd9defb14a7bd3e63cbd3e8d644b8d9..6b34395f17aa71880c9ba8a4fb92e64c8a4cb0b3 100644
--- a/src/dynamic-import/instn-iee-err-circular.case
+++ b/src/dynamic-import/instn-iee-err-circular.case
@@ -21,7 +21,6 @@ info: |
           i. Assert: this is a circular import request.
           ii. Return null.
 template: catch
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/instn-iee-err-not-found.case b/src/dynamic-import/instn-iee-err-not-found.case
index 3c6b40ea976c365d7aa5bce5f6bc814d9935b4b9..52cd8d0dfc1026eef56cfd6beb18cc747c27f105 100644
--- a/src/dynamic-import/instn-iee-err-not-found.case
+++ b/src/dynamic-import/instn-iee-err-not-found.case
@@ -20,7 +20,6 @@ info: |
         [...]
     11. Return starResolution.
 template: catch
-flags: [async]
 ---*/
 
 //- params
diff --git a/src/dynamic-import/returns-promise.case b/src/dynamic-import/returns-promise.case
index 84cba2a75968b8228acad14d5088c324d051cd54..0160b0704de9183a98e1e85cfd599974f005ba2d 100644
--- a/src/dynamic-import/returns-promise.case
+++ b/src/dynamic-import/returns-promise.case
@@ -4,7 +4,6 @@
 /*---
 desc: Dynamic import() returns a Promise object.
 template: default
-flags: [async]
 ---*/
 
 //- params