diff --git a/package-lock.json b/package-lock.json
index 9efa053d593..548f42af30d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42532,13 +42532,11 @@
         "@mongodb-js/testing-library-compass": "^1.3.1",
         "@mongodb-js/tsconfig-compass": "^1.2.8",
         "@types/babel__generator": "^7.6.8",
-        "@types/enzyme": "^3.10.14",
         "@types/lodash": "^4.14.188",
         "@types/semver": "^7.3.9",
         "chai": "^4.3.6",
         "depcheck": "^1.4.1",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
         "react-dom": "^17.0.2",
@@ -45423,12 +45421,10 @@
         "@mongodb-js/prettier-config-compass": "^1.2.8",
         "@mongodb-js/testing-library-compass": "^1.3.1",
         "@mongodb-js/tsconfig-compass": "^1.2.8",
-        "@types/enzyme": "^3.10.14",
         "chai": "^4.2.0",
         "depcheck": "^1.4.1",
         "electron": "^32.3.3",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "hadron-ipc": "^3.4.9",
         "mocha": "^10.2.0",
         "mongodb-instance-model": "^12.31.0",
@@ -45646,12 +45642,10 @@
         "@mongodb-js/prettier-config-compass": "^1.2.8",
         "@mongodb-js/testing-library-compass": "^1.3.1",
         "@mongodb-js/tsconfig-compass": "^1.2.8",
-        "@types/enzyme": "^3.10.14",
         "chai": "^4.2.0",
         "depcheck": "^1.4.1",
         "electron": "^32.3.3",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
         "react-dom": "^17.0.2",
@@ -55042,7 +55036,6 @@
         "@mongodb-js/testing-library-compass": "^1.3.1",
         "@mongodb-js/tsconfig-compass": "^1.2.8",
         "@types/babel__generator": "^7.6.8",
-        "@types/enzyme": "^3.10.14",
         "@types/lodash": "^4.14.188",
         "@types/semver": "^7.3.9",
         "bson": "^6.10.3",
@@ -55050,7 +55043,6 @@
         "compass-preferences-model": "^2.39.0",
         "depcheck": "^1.4.1",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "hadron-app-registry": "^9.4.10",
         "hadron-document": "^8.8.10",
         "hadron-type-checker": "^7.4.9",
@@ -57117,14 +57109,12 @@
         "@mongodb-js/prettier-config-compass": "^1.2.8",
         "@mongodb-js/testing-library-compass": "^1.3.1",
         "@mongodb-js/tsconfig-compass": "^1.2.8",
-        "@types/enzyme": "^3.10.14",
         "bson": "^6.10.3",
         "chai": "^4.2.0",
         "compass-preferences-model": "^2.39.0",
         "depcheck": "^1.4.1",
         "electron": "^32.3.3",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "hadron-app-registry": "^9.4.10",
         "hadron-ipc": "^3.4.9",
         "javascript-stringify": "^2.0.1",
@@ -57455,14 +57445,12 @@
         "@mongosh/browser-repl": "^3.10.3",
         "@mongosh/logging": "^3.7.2",
         "@mongosh/node-runtime-worker-thread": "^3.3.8",
-        "@types/enzyme": "^3.10.14",
         "bson": "^6.10.3",
         "chai": "^4.2.0",
         "compass-preferences-model": "^2.39.0",
         "depcheck": "^1.4.1",
         "electron": "^32.3.3",
         "electron-mocha": "^12.2.0",
-        "enzyme": "^3.11.0",
         "hadron-app-registry": "^9.4.10",
         "mocha": "^10.2.0",
         "nyc": "^15.1.0",
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
index a710f76f96d..886ece71a41 100644
--- a/packages/compass-aggregations/package.json
+++ b/packages/compass-aggregations/package.json
@@ -38,13 +38,11 @@
     "@mongodb-js/testing-library-compass": "^1.3.1",
     "@mongodb-js/tsconfig-compass": "^1.2.8",
     "@types/babel__generator": "^7.6.8",
-    "@types/enzyme": "^3.10.14",
     "@types/lodash": "^4.14.188",
     "@types/semver": "^7.3.9",
     "chai": "^4.3.6",
     "depcheck": "^1.4.1",
     "electron-mocha": "^12.2.0",
-    "enzyme": "^3.11.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "react-dom": "^17.0.2",
diff --git a/packages/compass-aggregations/src/components/saving-pipeline-modal/saving-pipeline-modal.spec.ts b/packages/compass-aggregations/src/components/saving-pipeline-modal/saving-pipeline-modal.spec.ts
deleted file mode 100644
index c2fb423c839..00000000000
--- a/packages/compass-aggregations/src/components/saving-pipeline-modal/saving-pipeline-modal.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// import React from 'react';
-// import { mount } from 'enzyme';
-
-// import SavingPipelineModal from '../saving-pipeline-modal';
-
-// import styles from './saving-pipeline-modal.module.less';
-
-// describe('SavingPipelineModal [Component]', () => {
-//   context('when the component is rendered', () => {
-//     let component;
-
-//     const savingPipelineNameChangedSpy = sinon.spy();
-//     const savingPipelineApplySpy = sinon.spy();
-//     const savingPipelineCancelSpy = sinon.spy();
-//     const saveCurrentPipelineSpy = sinon.spy();
-
-//     beforeEach(() => {
-//       component = mount(
-//         <SavingPipelineModal
-//           savingPipelineCancel={savingPipelineCancelSpy}
-//           savingPipelineApply={savingPipelineApplySpy}
-//           savingPipelineNameChanged={savingPipelineNameChangedSpy}
-//           saveCurrentPipeline={saveCurrentPipelineSpy}
-//           isOpen
-//           name=""
-//         />
-//       );
-//     });
-
-//     afterEach(() => {
-//       component = null;
-//     });
-//   });
-//   describe('Save As', () => {
-//     it('should have the name input prepopulated');
-//     it('should have a relative title');
-//   });
-// });
diff --git a/packages/compass-aggregations/src/components/settings/settings.spec.tsx b/packages/compass-aggregations/src/components/settings/settings.spec.tsx
index a8bee4d414b..824df8a9105 100644
--- a/packages/compass-aggregations/src/components/settings/settings.spec.tsx
+++ b/packages/compass-aggregations/src/components/settings/settings.spec.tsx
@@ -1,75 +1,90 @@
 import React from 'react';
-import { mount } from 'enzyme';
+import {
+  renderWithConnections,
+  screen,
+  userEvent,
+} from '@mongodb-js/testing-library-compass';
 import sinon from 'sinon';
 import { expect } from 'chai';
 
 import Settings from './settings';
 import { INITIAL_STATE } from '../../modules/settings';
 
+function renderSettings(
+  props: Partial<React.ComponentProps<typeof Settings>> = {},
+  preferences: {
+    enableAggregationBuilderExtraOptions?: boolean;
+  } = {}
+) {
+  return renderWithConnections(
+    <Settings
+      isExpanded={false}
+      isCommenting={false}
+      applySettings={() => {}}
+      toggleSettingsIsExpanded={() => {}}
+      toggleSettingsIsCommentMode={() => {}}
+      setSettingsSampleSize={() => {}}
+      setSettingsLimit={() => {}}
+      limit={INITIAL_STATE.sampleSize}
+      largeLimit={INITIAL_STATE.limit}
+      settings={INITIAL_STATE}
+      {...props}
+    />,
+    {
+      preferences,
+    }
+  );
+}
+
+const largeLimitOptionTestId = 'aggregation-settings-limit-input';
+
 describe('Settings [Component]', function () {
-  let state: any;
-  let component: ReturnType<typeof mount>;
   let applySettingsSpy: sinon.SinonSpy;
   let toggleSettingsIsExpandedSpy: sinon.SinonSpy;
-  let toggleSettingsIsCommentModeSpy: sinon.SinonSpy;
-  let setSettingsSampleSizeSpy: sinon.SinonSpy;
-  let setSettingsLimitSpy: sinon.SinonSpy;
-  let runStageSpy: sinon.SinonSpy;
 
   context('when the component is not atlas deployed', function () {
-    beforeEach(function () {
-      applySettingsSpy = sinon.spy();
-      toggleSettingsIsExpandedSpy = sinon.spy();
-      toggleSettingsIsCommentModeSpy = sinon.spy();
-      setSettingsSampleSizeSpy = sinon.spy();
-      setSettingsLimitSpy = sinon.spy();
-      runStageSpy = sinon.spy();
-
-      state = {
-        ...INITIAL_STATE,
-        applySettings: applySettingsSpy,
-        toggleSettingsIsExpanded: toggleSettingsIsExpandedSpy,
-        toggleSettingsIsCommentMode: toggleSettingsIsCommentModeSpy,
-        setSettingsSampleSize: setSettingsSampleSizeSpy,
-        setSettingsLimit: setSettingsLimitSpy,
-        isCommenting: true,
-        limit: INITIAL_STATE.sampleSize,
-        largeLimit: INITIAL_STATE.limit,
-        runStage: runStageSpy,
-        settings: INITIAL_STATE,
-      };
-    });
-
     it('is hidden by default', function () {
-      component = mount(<Settings {...state} />);
-      expect(Object.keys(component).length).to.equal(0);
+      renderSettings();
+      expect(screen.queryByText('Settings')).to.not.exist;
     });
 
     it('is rendered when isExpanded=true', function () {
-      const props = { ...state, isExpanded: true };
-      component = mount(<Settings {...props} />);
-      expect(component.text()).to.contain('Settings');
+      renderSettings({
+        isExpanded: true,
+      });
+      expect(screen.getByText('Settings')).to.be.visible;
+    });
+
+    it('shows the large limit option', function () {
+      renderSettings({
+        isExpanded: true,
+      });
+      expect(screen.getByTestId(largeLimitOptionTestId)).to.be.visible;
     });
 
     describe('When opened', function () {
+      beforeEach(function () {
+        applySettingsSpy = sinon.spy();
+        toggleSettingsIsExpandedSpy = sinon.spy();
+      });
+
       it('should close when Cancel is clicked', function () {
-        const props = { ...state, isExpanded: true };
-        component = mount(<Settings {...props} />);
-        component
-          .find('#aggregations-settings-cancel')
-          .hostNodes()
-          .simulate('click');
+        renderSettings({
+          isExpanded: true,
+          applySettings: applySettingsSpy,
+          toggleSettingsIsExpanded: toggleSettingsIsExpandedSpy,
+        });
+        userEvent.click(screen.getByTestId('aggregation-settings-cancel'));
         expect(toggleSettingsIsExpandedSpy.calledOnce).to.equal(true);
       });
 
       it('should update the settings, re-run the pipeline, and Close', function () {
-        const props = { ...state, isExpanded: true };
-
-        component = mount(<Settings {...props} />);
-        component
-          .find('#aggregation-settings-apply')
-          .hostNodes()
-          .simulate('click');
+        renderSettings({
+          isExpanded: true,
+          applySettings: applySettingsSpy,
+          toggleSettingsIsExpanded: toggleSettingsIsExpandedSpy,
+        });
+        userEvent.click(screen.getByTestId('aggregation-settings-apply'));
 
         expect(applySettingsSpy.calledOnce).to.equal(true);
         expect(toggleSettingsIsExpandedSpy.calledOnce).to.equal(true);
@@ -79,32 +94,18 @@ describe('Settings [Component]', function () {
 
   context('when the component is atlas deployed', function () {
     beforeEach(function () {
-      applySettingsSpy = sinon.spy();
-      toggleSettingsIsExpandedSpy = sinon.spy();
-      toggleSettingsIsCommentModeSpy = sinon.spy();
-      setSettingsSampleSizeSpy = sinon.spy();
-      setSettingsLimitSpy = sinon.spy();
-      runStageSpy = sinon.spy();
-
-      state = {
-        ...INITIAL_STATE,
-        applySettings: applySettingsSpy,
-        toggleSettingsIsExpanded: toggleSettingsIsExpandedSpy,
-        toggleSettingsIsCommentMode: toggleSettingsIsCommentModeSpy,
-        setSettingsSampleSize: setSettingsSampleSizeSpy,
-        setSettingsLimit: setSettingsLimitSpy,
-        isCommenting: true,
-        limit: INITIAL_STATE.sampleSize,
-        largeLimit: INITIAL_STATE.limit,
-        runStage: runStageSpy,
-        settings: INITIAL_STATE,
-      };
+      renderSettings(
+        {
+          isExpanded: true,
+        },
+        {
+          enableAggregationBuilderExtraOptions: false,
+        }
+      );
     });
 
     it('hides the large limit option', function () {
-      const props = { ...state };
-      component = mount(<Settings {...props} />);
-      expect(component.find('label[innerText="Limit"]')).to.not.exist;
+      expect(screen.queryByTestId(largeLimitOptionTestId)).to.not.exist;
     });
   });
 });
diff --git a/packages/compass-aggregations/src/components/settings/settings.tsx b/packages/compass-aggregations/src/components/settings/settings.tsx
index a3e6a40ff6d..2e233a5f0a0 100644
--- a/packages/compass-aggregations/src/components/settings/settings.tsx
+++ b/packages/compass-aggregations/src/components/settings/settings.tsx
@@ -169,14 +169,14 @@ function Settings({
         <Body weight="medium">Settings</Body>
         <div className={headerButtonGroupStyles}>
           <Button
-            id="aggregations-settings-cancel"
+            data-testid="aggregation-settings-cancel"
             size="xsmall"
             onClick={toggleSettingsIsExpanded}
           >
             Cancel
           </Button>
           <Button
-            id="aggregation-settings-apply"
+            data-testid="aggregation-settings-apply"
             size="xsmall"
             variant="primary"
             onClick={onApplyClicked}
@@ -253,6 +253,7 @@ function Settings({
           </div>
           <div className={inputControlStyles}>
             <TextInput
+              data-testid="aggregation-settings-limit-input"
               id={aggregationLimitId}
               aria-labelledby={aggregationLimitLabelId}
               aria-describedby={aggregationLimitDescriptionId}
diff --git a/packages/compass-e2e-tests/helpers/selectors.ts b/packages/compass-e2e-tests/helpers/selectors.ts
index b53a0242a64..0f66ed83304 100644
--- a/packages/compass-e2e-tests/helpers/selectors.ts
+++ b/packages/compass-e2e-tests/helpers/selectors.ts
@@ -835,7 +835,8 @@ export const AggregationSettingsButton =
 export const AggregationPipelineName = '[data-testid="pipeline-name"]';
 export const AggregationCommentModeCheckbox = '#aggregation-comment-mode';
 export const AggregationSampleSizeInput = '#aggregation-sample-size';
-export const AggregationSettingsApplyButton = '#aggregation-settings-apply';
+export const AggregationSettingsApplyButton =
+  '[data-testid="aggregation-settings-apply"]';
 export const AddStageButton = '[data-testid="add-stage"]';
 export const ExportAggregationToLanguage =
   '[data-testid="pipeline-toolbar-export-button"]';
diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json
index 8e2f7f92e60..eef2c69a327 100644
--- a/packages/compass-schema-validation/package.json
+++ b/packages/compass-schema-validation/package.json
@@ -53,12 +53,10 @@
     "@mongodb-js/prettier-config-compass": "^1.2.8",
     "@mongodb-js/testing-library-compass": "^1.3.1",
     "@mongodb-js/tsconfig-compass": "^1.2.8",
-    "@types/enzyme": "^3.10.14",
     "chai": "^4.2.0",
     "depcheck": "^1.4.1",
     "electron": "^32.3.3",
     "electron-mocha": "^12.2.0",
-    "enzyme": "^3.11.0",
     "hadron-ipc": "^3.4.9",
     "mocha": "^10.2.0",
     "mongodb-instance-model": "^12.31.0",
diff --git a/packages/compass-schema-validation/src/components/compass-schema-validation.spec.tsx b/packages/compass-schema-validation/src/components/compass-schema-validation.spec.tsx
index 96b7a79552d..518ce9c4fd2 100644
--- a/packages/compass-schema-validation/src/components/compass-schema-validation.spec.tsx
+++ b/packages/compass-schema-validation/src/components/compass-schema-validation.spec.tsx
@@ -1,31 +1,24 @@
 import React from 'react';
-import { mount } from 'enzyme';
 import { expect } from 'chai';
+import { render, screen } from '@mongodb-js/testing-library-compass';
+import { Provider } from 'react-redux';
 
 import { CompassSchemaValidation } from './compass-schema-validation';
 import { configureStore } from '../stores/store';
-import { Provider } from 'react-redux';
 
 describe('CompassSchemaValidation [Component]', function () {
-  let component: any;
   let store: ReturnType<typeof configureStore> | null;
 
   beforeEach(function () {
     store = configureStore({}, {} as any);
-    component = mount(
+    render(
       <Provider store={store}>
         <CompassSchemaValidation />
       </Provider>
     );
   });
 
-  afterEach(function () {
-    store = null;
-    component = null;
-  });
-
-  it('renders the correct root classname', function () {
-    expect(component.find(`[data-testid="compass-schema-validation"]`)).to
-      .exist;
+  it('renders the correct root', function () {
+    expect(screen.getByTestId('compass-schema-validation')).to.be.visible;
   });
 });
diff --git a/packages/compass-schema-validation/src/components/document-preview.spec.tsx b/packages/compass-schema-validation/src/components/document-preview.spec.tsx
index 23b90b8cb66..385f3cfbd1b 100644
--- a/packages/compass-schema-validation/src/components/document-preview.spec.tsx
+++ b/packages/compass-schema-validation/src/components/document-preview.spec.tsx
@@ -1,19 +1,19 @@
 import React from 'react';
-import { mount } from 'enzyme';
 import { expect } from 'chai';
+import { render, screen } from '@mongodb-js/testing-library-compass';
 
 import { DocumentPreview } from './document-preview';
 
 describe('DocumentPreview [Component]', function () {
   context('when document loading state is success', function () {
     it('renders a document if there is one present', function () {
-      const component = mount(<DocumentPreview document={{}} />);
-      expect(component.find('HadronDocument')).to.exist;
+      render(<DocumentPreview document={{}} />);
+      expect(screen.getByTestId('hadron-document')).to.be.visible;
     });
 
     it('renders a no preview text when there is no document', function () {
-      const component = mount(<DocumentPreview />);
-      expect(component).to.have.text('No Preview Documents');
+      render(<DocumentPreview />);
+      expect(screen.getByText('No Preview Documents')).to.be.visible;
     });
   });
 });
diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json
index 825e5b333fe..93a4c44b166 100644
--- a/packages/compass-shell/package.json
+++ b/packages/compass-shell/package.json
@@ -74,12 +74,10 @@
     "@mongodb-js/prettier-config-compass": "^1.2.8",
     "@mongodb-js/testing-library-compass": "^1.3.1",
     "@mongodb-js/tsconfig-compass": "^1.2.8",
-    "@types/enzyme": "^3.10.14",
     "chai": "^4.2.0",
     "depcheck": "^1.4.1",
     "electron": "^32.3.3",
     "electron-mocha": "^12.2.0",
-    "enzyme": "^3.11.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "react-dom": "^17.0.2",
diff --git a/packages/compass-shell/src/components/shell-header/shell-header.spec.tsx b/packages/compass-shell/src/components/shell-header/shell-header.spec.tsx
index d4fcde54498..4f0410bc1bc 100644
--- a/packages/compass-shell/src/components/shell-header/shell-header.spec.tsx
+++ b/packages/compass-shell/src/components/shell-header/shell-header.spec.tsx
@@ -1,74 +1,59 @@
 import React from 'react';
-import { mount, shallow } from 'enzyme';
-import { Icon, IconButton, SpinLoader } from '@mongodb-js/compass-components';
+import { render, screen } from '@mongodb-js/testing-library-compass';
 import { expect } from 'chai';
 
 import { ShellHeader } from './shell-header';
 
+function renderShellHeader(props) {
+  return render(
+    <ShellHeader
+      isExpanded={false}
+      isOperationInProgress={false}
+      onShellToggleClicked={() => {}}
+      showInfoModal={() => {}}
+      {...props}
+    />
+  );
+}
+
 describe('ShellHeader', function () {
   context('when isExpanded prop is true', function () {
-    let wrapper;
-
     beforeEach(function () {
-      wrapper = mount(
-        <ShellHeader
-          darkMode={undefined}
-          isExpanded
-          isOperationInProgress={false}
-          onShellToggleClicked={() => {}}
-          showInfoModal={() => {}}
-        />
-      );
-    });
-
-    afterEach(function () {
-      wrapper.unmount();
+      renderShellHeader({
+        isExpanded: true,
+      });
     });
 
     it('renders a close chevron button', function () {
-      expect(wrapper.find(IconButton).exists()).to.equal(true);
-      expect(wrapper.find(Icon).at(1).prop('glyph')).to.equal('ChevronDown');
+      expect(screen.getByTestId('shell-toggle-button-close')).to.be.visible;
     });
 
     it('renders an info button', function () {
-      expect(wrapper.find(IconButton).exists()).to.equal(true);
-      expect(wrapper.find(Icon).at(0).prop('glyph')).to.equal('InfoWithCircle');
+      expect(screen.getByTestId('shell-info-button')).to.be.visible;
     });
 
     it('does not render the loader', function () {
-      expect(wrapper.find(SpinLoader).exists()).to.equal(false);
+      expect(screen.queryByTestId('shell-operation-in-progress')).to.not.exist;
     });
   });
 
   context('when isExpanded prop is false', function () {
-    let wrapper;
     beforeEach(function () {
-      wrapper = mount(
-        <ShellHeader
-          darkMode={undefined}
-          isExpanded={false}
-          isOperationInProgress={false}
-          onShellToggleClicked={() => {}}
-          showInfoModal={() => {}}
-        />
-      );
-    });
-
-    afterEach(function () {
-      wrapper.unmount();
+      renderShellHeader({
+        isExpanded: false,
+      });
     });
 
     it('renders an open chevron button', function () {
-      expect(wrapper.find(IconButton).exists()).to.equal(true);
-      expect(wrapper.find(Icon).prop('glyph')).to.equal('ChevronUp');
+      expect(screen.getByTestId('shell-toggle-button-open')).to.be.visible;
     });
 
     it('does not render the loader', function () {
-      expect(wrapper.find(SpinLoader).exists()).to.equal(false);
+      expect(screen.queryByTestId('shell-operation-in-progress')).to.not.exist;
     });
 
     it('renders title with guide cue', function () {
-      expect(wrapper.text()).to.contain('_MONGOSH');
+      expect(screen.getByTestId('shell-expand-button')).to.be.visible;
     });
   });
 
@@ -76,38 +61,24 @@ describe('ShellHeader', function () {
     'when isExpanded is false and isOperationInProgress is true',
     function () {
       it('renders the loader', function () {
-        const wrapper = mount(
-          <ShellHeader
-            darkMode={undefined}
-            isExpanded={false}
-            isOperationInProgress
-            onShellToggleClicked={() => {}}
-            showInfoModal={() => {}}
-          />
-        );
+        renderShellHeader({
+          isExpanded: false,
+          isOperationInProgress: true,
+        });
 
-        expect(wrapper.find(SpinLoader).exists()).to.equal(true);
-        wrapper.unmount();
+        expect(screen.getByTestId('shell-operation-in-progress')).to.be.visible;
       });
     }
   );
 
   context('when rendered', function () {
     it('has a button to toggle the container', function () {
-      const wrapper = shallow(
-        <ShellHeader
-          darkMode={undefined}
-          isExpanded={false}
-          isOperationInProgress={false}
-          onShellToggleClicked={() => {}}
-          showInfoModal={() => {}}
-        />
-      );
-
-      expect(wrapper.find('button').exists()).to.equal(true);
-      expect(wrapper.find('[data-testid="shell-expand-button"]')).to.exist;
+      renderShellHeader({
+        isExpanded: false,
+        isOperationInProgress: false,
+      });
 
-      wrapper.unmount();
+      expect(screen.getByTestId('shell-expand-button')).to.be.visible;
     });
   });
 });
diff --git a/packages/compass-shell/src/components/shell-header/shell-header.tsx b/packages/compass-shell/src/components/shell-header/shell-header.tsx
index 70372a929a5..5c163b37da3 100644
--- a/packages/compass-shell/src/components/shell-header/shell-header.tsx
+++ b/packages/compass-shell/src/components/shell-header/shell-header.tsx
@@ -120,7 +120,10 @@ export const ShellHeader = ({
             <span>&gt;_MONGOSH</span>
 
             {!isExpanded && isOperationInProgress && (
-              <span className={operationInProgressStyles}>
+              <span
+                data-testid="shell-operation-in-progress"
+                className={operationInProgressStyles}
+              >
                 <SpinLoader darkMode={true} />
                 &nbsp;Command in progress&hellip;
               </span>
@@ -142,6 +145,9 @@ export const ShellHeader = ({
         {showCollapseExpandChevron && (
           <IconButton
             aria-label={isExpanded ? 'Close Shell' : 'Open Shell'}
+            data-testid={`shell-toggle-button${
+              isExpanded ? '-close' : '-open'
+            }`}
             onClick={onShellToggleClicked}
             aria-pressed={isExpanded}
           >
diff --git a/packages/compass-shell/src/components/shell-info-modal/shell-info-modal.spec.tsx b/packages/compass-shell/src/components/shell-info-modal/shell-info-modal.spec.tsx
index 246345f8c87..9e8a867944d 100644
--- a/packages/compass-shell/src/components/shell-info-modal/shell-info-modal.spec.tsx
+++ b/packages/compass-shell/src/components/shell-info-modal/shell-info-modal.spec.tsx
@@ -1,34 +1,26 @@
 import React from 'react';
-import { mount } from 'enzyme';
+import { render, screen } from '@mongodb-js/testing-library-compass';
 import { expect } from 'chai';
 
 import ShellInfoModal from './shell-info-modal';
 
 describe('InfoModal [Component]', function () {
-  let component;
-
   beforeEach(function () {
-    component = mount(
+    render(
       <ShellInfoModal show hideInfoModal={() => {}} mongoshVersion="v2.3.456" />
     );
   });
 
-  afterEach(function () {
-    component = null;
-  });
-
   it('renders the title text', function () {
-    const title = component.find('h1').text();
-    expect(title).to.match(/^mongosh v2\.\d+\.\d+/);
+    expect(screen.getByText(/^mongosh v2\.\d+\.\d+/)).to.be.visible;
   });
 
   it('renders the hotkeys key', function () {
-    expect(component.text()).to.include('CtrlF');
+    expect(screen.getAllByText('Ctrl').at(0)).to.be.visible;
   });
 
   it('renders the hotkeys description', function () {
-    expect(component.text()).to.include(
-      'CtrlFMoves the cursor Forward one character.'
-    );
+    expect(screen.getByText('Moves the cursor Forward one character.')).to.be
+      .visible;
   });
 });
diff --git a/packages/compass-shell/src/modules/worker-runtime.ts b/packages/compass-shell/src/modules/worker-runtime.ts
index d0e8d6f8ba0..862ef4ce26f 100644
--- a/packages/compass-shell/src/modules/worker-runtime.ts
+++ b/packages/compass-shell/src/modules/worker-runtime.ts
@@ -63,7 +63,7 @@ export function createWorkerRuntime(
       // already check whether Compass telemetry is enabled or not.
       track: ({ event, properties }) => {
         return track(
-          `Shell ${event as string}`,
+          `Shell ${event}`,
           // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
           properties,
           connectionInfo.current