diff --git a/package.json b/package.json
index 68b4adc..eca43a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@autorest/clicommon",
-    "version": "0.5.7",
+    "version": "0.5.8",
     "description": "Autorest Azure Cli Common Module",
     "main": "dist/index.js",
     "engines": {
diff --git a/src/index.ts b/src/index.ts
index fe57554..6cc65f8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,7 +23,7 @@ extension.Add("cli-test", async host => {
     dumper.dumpCodeModel("test-pre", session.model);
 
     // add test scenario from common settings
-    const cliCommonSettings = await host.GetValue("cli");
+    const cliCommonSettings = await host.GetValue("test") || await host.GetValue("cli");
     if (cliCommonSettings) {
         session.model["test-scenario"] = cliCommonSettings['test-scenario'] || cliCommonSettings['test-setup'];
     }