diff --git a/newtests/lsp/code-action/test.js b/newtests/lsp/code-action/test.js
index aa279007c97..3b70e6c5892 100644
--- a/newtests/lsp/code-action/test.js
+++ b/newtests/lsp/code-action/test.js
@@ -26,7 +26,7 @@ module.exports = (suite(
         [
           [
             'initialize',
-            '{"codeActionProvider":{"codeActionKinds":["refactor.extract","quickfix"]}}',
+            '{"codeActionProvider":{"codeActionKinds":["source","source.addMissingImports.flow","source.organizeImports.flow","refactor.extract","quickfix"]}}',
           ],
         ],
         [...lspIgnoreStatusAndCancellation],
diff --git a/packages/flow-dev-tools/src/test/TestStep.js b/packages/flow-dev-tools/src/test/TestStep.js
index b19c31138c7..7bf1e5d9957 100644
--- a/packages/flow-dev-tools/src/test/TestStep.js
+++ b/packages/flow-dev-tools/src/test/TestStep.js
@@ -432,7 +432,16 @@ class TestStepFirstStage extends TestStepFirstOrSecondStage {
         codeAction: {
           codeActionLiteralSupport: {
             codeActionKind: {
-              valueSet: ['quickfix', 'refactor.extract'],
+              valueSet: [
+                '',
+                'quickfix',
+                'refactor',
+                'refactor.extract',
+                'refactor.inline',
+                'refactor.rewrite',
+                'source',
+                'source.organizeImports',
+              ],
             },
           },
         },