diff --git a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
index b90a818055..0b41fd2894 100644
--- a/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
+++ b/Composer/packages/client/__tests__/pages/botProjectsSettings/BotProjectSettings.test.tsx
@@ -63,8 +63,8 @@ describe('<BotProjectSettings />', () => {
     await act(async () => {
       await fireEvent.click(jsonToggleNode);
     });
-    const jsonEditorNode = await component.findByTestId('jsonEditor');
-    expect(jsonEditorNode).toBeTruthy();
+    const editorNode = await component.findByTestId('BaseEditor');
+    expect(editorNode).toBeTruthy();
 
     await act(async () => {
       await fireEvent.click(jsonToggleNode);
diff --git a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
index 231a683625..fa0dec41ad 100644
--- a/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
+++ b/Composer/packages/client/src/pages/botProject/BotProjectSettings.tsx
@@ -139,15 +139,13 @@ const BotProjectSettings: React.FC<RouteComponentProps<{ projectId: string; skil
       <Suspense fallback={<LoadingSpinner />}>
         <div css={container}>
           {isAdvancedSettingsEnabled ? (
-            <div data-testid="jsonEditor">
-              <JsonEditor
-                key={'settingsjson'}
-                editorSettings={userSettings.codeEditor}
-                id={currentProjectId}
-                value={mergedSettings}
-                onChange={handleChange}
-              />
-            </div>
+            <JsonEditor
+              key={'settingsjson'}
+              editorSettings={userSettings.codeEditor}
+              id={currentProjectId}
+              value={mergedSettings}
+              onChange={handleChange}
+            />
           ) : (
             <BotProjectSettingsTabView projectId={currentProjectId} scrollToSectionId={props.location?.hash} />
           )}