diff --git a/airbyte-webapp/src/locales/en.json b/airbyte-webapp/src/locales/en.json
index a4f799b7ce91a..38c0e428e8eb1 100644
--- a/airbyte-webapp/src/locales/en.json
+++ b/airbyte-webapp/src/locales/en.json
@@ -65,7 +65,6 @@
   "form.saveChangesAndTest": "Test and save",
   "form.sourceRetest": "Retest saved source",
   "form.destinationRetest": "Retest saved destination",
-  "form.test": "Test",
   "form.sourceRetestTitle": "Test the source",
   "form.destinationRetestTitle": "Test the destination",
   "form.discardChanges": "Discard changes",
diff --git a/airbyte-webapp/src/views/Connector/ConnectorCard/components/Controls.tsx b/airbyte-webapp/src/views/Connector/ConnectorCard/components/Controls.tsx
index b2a3e7527ba82..b54e1b189ef71 100644
--- a/airbyte-webapp/src/views/Connector/ConnectorCard/components/Controls.tsx
+++ b/airbyte-webapp/src/views/Connector/ConnectorCard/components/Controls.tsx
@@ -36,9 +36,12 @@ export const Controls: React.FC<IProps> = ({
   onCancelClick,
   ...restProps
 }) => {
+  const showTestCard =
+    hasDefinition &&
+    (isEditMode || isTestConnectionInProgress || restProps.connectionTestSuccess || restProps.errorMessage);
   return (
     <>
-      {hasDefinition && (
+      {showTestCard && (
         <TestCard
           {...restProps}
           dirty={dirty}
diff --git a/airbyte-webapp/src/views/Connector/ConnectorCard/components/TestCard.tsx b/airbyte-webapp/src/views/Connector/ConnectorCard/components/TestCard.tsx
index 75dac5a0e05bc..6dc486ad34397 100644
--- a/airbyte-webapp/src/views/Connector/ConnectorCard/components/TestCard.tsx
+++ b/airbyte-webapp/src/views/Connector/ConnectorCard/components/TestCard.tsx
@@ -84,12 +84,13 @@ export const TestCard: React.FC<IProps> = ({
               <FormattedMessage id={`form.${formType}RetestTitle`} />
             </Text>
           </FlexItem>
-          {isTestConnectionInProgress ? (
+          {isTestConnectionInProgress || !isEditMode ? (
             <Button
               className={styles.button}
               icon={<FontAwesomeIcon icon={faClose} />}
               variant="secondary"
               type="button"
+              disabled={!isTestConnectionInProgress}
               onClick={() => onCancelTesting?.()}
             >
               <FormattedMessage id="form.cancel" />
@@ -101,9 +102,9 @@ export const TestCard: React.FC<IProps> = ({
               variant="secondary"
               icon={<FontAwesomeIcon icon={faRefresh} />}
               // disable if there are changes in edit mode because the retest API can currently only test the saved state
-              disabled={!isValid || (isEditMode && dirty)}
+              disabled={!isValid || dirty}
             >
-              <FormattedMessage id={!isEditMode ? "form.test" : `form.${formType}Retest`} />
+              <FormattedMessage id={`form.${formType}Retest`} />
             </Button>
           )}
         </FlexContainer>