diff --git a/cypress/integrations/admin_activities/diseases_activities/add_disease_activity.cy.ts b/cypress/integrations/admin_activities/diseases_activities/add_disease_activity.cy.ts
new file mode 100644
index 000000000..613c8e037
--- /dev/null
+++ b/cypress/integrations/admin_activities/diseases_activities/add_disease_activity.cy.ts
@@ -0,0 +1,55 @@
+/// <reference types="cypress" />
+
+const DISEASE_STARTS_PATH = "/admin/diseases";
+
+describe("Add Disease Activity specs", () => {
+  it("should render the ui", () => {
+    cy.authenticate(DISEASE_STARTS_PATH);
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+
+  it("should show disease creation form", () => {
+    cy.dataCy("add-new-disease").click();
+    cy.dataCy("activity-title").contains("Add Disease");
+  });
+
+  it("should fail to create a new disease", () => {
+    cy.byId("code").type("FAIL");
+    cy.byId("diseaseType").click();
+    cy.get('.MuiAutocomplete-popper li[data-option-index="0"]').click();
+    cy.byId("description").type("Children disease");
+    cy.get('input[name="opdInclude"]').check();
+    cy.get('input[name="ipdInInclude"]').check();
+    cy.get('input[name="ipdInInclude"]').uncheck();
+    cy.dataCy("submit-form").click();
+    cy.dataCy("info-box").contains("Fail");
+  });
+
+  it("should successfully create a new disease", () => {
+    cy.byId("code").clear().type("22");
+    cy.dataCy("submit-form").click();
+    cy.dataCy("dialog-info").contains("Disease has been created successfully!");
+    cy.dataCy("approve-dialog").click();
+  });
+
+  it("should redirect after disease creation", () => {
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+
+  it("should cancel the cancellation of the disease creation", () => {
+    cy.dataCy("add-new-disease").click();
+    cy.dataCy("cancel-form").click();
+    cy.dataCy("dialog-info").contains(
+      "Are you sure to Reset the Form? All the unsaved data will be lost."
+    );
+    cy.dataCy("close-dialog").click();
+    cy.dataCy("dialog-info").should("not.exist");
+  });
+
+  it("should cancel the disease creation", () => {
+    cy.dataCy("cancel-form").click();
+    cy.dataCy("approve-dialog").click();
+    cy.dataCy("dialog-info").should("not.exist");
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+});
diff --git a/cypress/integrations/admin_activities/diseases_activities/edit_disease_activity.cy.ts b/cypress/integrations/admin_activities/diseases_activities/edit_disease_activity.cy.ts
new file mode 100644
index 000000000..ba877fda8
--- /dev/null
+++ b/cypress/integrations/admin_activities/diseases_activities/edit_disease_activity.cy.ts
@@ -0,0 +1,53 @@
+/// <reference types="cypress" />
+
+const DISEASE_START_PATH = "/admin/diseases";
+
+describe("Diseases Edit Activity specs", () => {
+  it("should render the ui", () => {
+    cy.authenticate(DISEASE_START_PATH);
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+
+  it("should show disease edit form", () => {
+    cy.dataCy("table-edit-action").first().click();
+    cy.dataCy("activity-title").contains("Edit Disease");
+  });
+
+  it("should fail to edit the disease", () => {
+    cy.byId("code").should("be.disabled");
+    cy.get('input[name="opdInclude"]').uncheck();
+    cy.get('input[name="ipdInInclude"]').check();
+    cy.byId("diseaseType").clear();
+    cy.dataCy("submit-form").click();
+    cy.dataCy("dialog-info").should("not.exist");
+  });
+
+  it("should successfully save disease changes", () => {
+    cy.byId("diseaseType").click();
+    cy.get('.MuiAutocomplete-popper li[data-option-index="0"]').click();
+    cy.dataCy("submit-form").click();
+    cy.dataCy("dialog-info").contains("has been updated successfully!");
+    cy.dataCy("approve-dialog").click();
+  });
+
+  it("should redirect after disease update", () => {
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+
+  it("should cancel the cancellation of the disease creation", () => {
+    cy.dataCy("table-edit-action").first().click();
+    cy.dataCy("cancel-form").click();
+    cy.dataCy("dialog-info").contains(
+      "Are you sure to Reset the Form? All the unsaved data will be lost."
+    );
+    cy.dataCy("close-dialog").click();
+    cy.dataCy("dialog-info").should("not.exist");
+  });
+
+  it("should cancel the disease update", () => {
+    cy.dataCy("cancel-form").click();
+    cy.dataCy("approve-dialog").click();
+    cy.dataCy("dialog-info").should("not.exist");
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+});
diff --git a/cypress/integrations/admin_activities/diseases_activities/manage_diseases_activity.cy.ts b/cypress/integrations/admin_activities/diseases_activities/manage_diseases_activity.cy.ts
new file mode 100644
index 000000000..920ee99c4
--- /dev/null
+++ b/cypress/integrations/admin_activities/diseases_activities/manage_diseases_activity.cy.ts
@@ -0,0 +1,19 @@
+/// <reference types="cypress" />
+
+const DISEASES_START_PATH = "/admin/diseases";
+
+describe("Diseases Activity specs", () => {
+  it("should render the ui", () => {
+    cy.authenticate(DISEASES_START_PATH);
+    cy.dataCy("activity-title").contains("Diseases");
+  });
+
+  it("should present the table with three rows", () => {
+    cy.dataCy("diseases-table")
+      .find("table")
+      .then(($table) => {
+        const rows = $table.find("tbody tr");
+        expect(rows.length).equal(3);
+      });
+  });
+});
diff --git a/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts b/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts
index 8d6ac8401..e2f4a3ab5 100644
--- a/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts
+++ b/cypress/integrations/admin_activities/wards_activities/add_ward_activity.cy.ts
@@ -2,7 +2,7 @@
 
 const WARD_START_PATH = "/admin/wards";
 
-describe("Wards Activity specs", () => {
+describe("Add Ward Activity specs", () => {
   it("should render the ui", () => {
     cy.authenticate(WARD_START_PATH);
     cy.dataCy("activity-title").contains("Wards");
diff --git a/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts b/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts
index 57acada34..7338f58a3 100644
--- a/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts
+++ b/cypress/integrations/admin_activities/wards_activities/edit_ward_activity.cy.ts
@@ -2,7 +2,7 @@
 
 const WARD_STARTS_PATH = "/admin/wards";
 
-describe("Wards Activity specs", () => {
+describe("Edit Ward Activity specs", () => {
   it("should render the ui", () => {
     cy.authenticate(WARD_STARTS_PATH);
     cy.dataCy("activity-title").contains("Wards");
diff --git a/src/components/accessories/admin/diseases/Diseases.tsx b/src/components/accessories/admin/diseases/Diseases.tsx
index cb4fd7313..3a112b82e 100644
--- a/src/components/accessories/admin/diseases/Diseases.tsx
+++ b/src/components/accessories/admin/diseases/Diseases.tsx
@@ -27,7 +27,7 @@ export const Diseases = () => {
   };
 
   return (
-    <div className={classes.diseases}>
+    <div className={classes.diseases} data-cy="diseases-table">
       <DiseaseTable
         onEdit={handleEdit}
         headerActions={
@@ -35,6 +35,7 @@ export const Diseases = () => {
             onClick={() => {
               navigate(PATHS.admin_diseases_new);
             }}
+            dataCy="add-new-disease"
             type="button"
             variant="contained"
             color="primary"
diff --git a/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx b/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx
index bfd9590a6..36a2b034a 100644
--- a/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx
+++ b/src/components/accessories/admin/diseases/diseaseForm/DiseaseForm.tsx
@@ -221,13 +221,19 @@ const DiseaseForm: FC<IDiseaseProps> = ({
 
         <div className="diseaseForm__buttonSet">
           <div className="submit_button">
-            <Button type="submit" variant="contained" disabled={isLoading}>
+            <Button
+              type="submit"
+              dataCy="submit-form"
+              variant="contained"
+              disabled={isLoading}
+            >
               {submitButtonLabel}
             </Button>
           </div>
           <div className="reset_button">
             <Button
               type="reset"
+              dataCy="cancel-form"
               variant="text"
               disabled={isLoading}
               onClick={() => setOpenResetConfirmation(true)}
diff --git a/src/components/accessories/table/Table.tsx b/src/components/accessories/table/Table.tsx
index c36ce21af..70b2ad4e1 100644
--- a/src/components/accessories/table/Table.tsx
+++ b/src/components/accessories/table/Table.tsx
@@ -105,6 +105,7 @@ const Table: FunctionComponent<IProps> = ({
       case "edit":
         return (
           <IconButton
+            data-cy="table-edit-action"
             title="Edit"
             size="small"
             onClick={() => onEdit && onEdit(row)}
@@ -115,6 +116,7 @@ const Table: FunctionComponent<IProps> = ({
       case "delete":
         return (
           <IconButton
+            data-cy="table-delete-action"
             size="small"
             title="Delete"
             onClick={() => {
@@ -128,6 +130,7 @@ const Table: FunctionComponent<IProps> = ({
       case "print":
         return (
           <IconButton
+            data-cy="table-print-action"
             size="small"
             title="Print"
             onClick={() => onPrint && onPrint(row)}
@@ -139,6 +142,7 @@ const Table: FunctionComponent<IProps> = ({
       case "view":
         return (
           <IconButton
+            data-cy="table-view-action"
             size="small"
             title="View details"
             onClick={() => onView && onView(row)}
@@ -149,6 +153,7 @@ const Table: FunctionComponent<IProps> = ({
       case "pay":
         return (
           <IconButton
+            data-cy="table-pay-action"
             size="small"
             title="Add a payment"
             onClick={() => onPay && onPay(row)}
@@ -160,6 +165,7 @@ const Table: FunctionComponent<IProps> = ({
       case "close":
         return (
           <IconButton
+            data-cy="table-close-action"
             size="small"
             title="Close the bill"
             onClick={() => onClose && onClose(row)}
@@ -171,6 +177,7 @@ const Table: FunctionComponent<IProps> = ({
       case "cancel":
         return (
           <IconButton
+            data-cy="table-cancel-action"
             size="small"
             title="Cancel"
             onClick={() => {
@@ -184,6 +191,7 @@ const Table: FunctionComponent<IProps> = ({
       case "add":
         return (
           <IconButton
+            data-cy="table-add-action"
             size="small"
             title={addTitle ?? "Add"}
             onClick={() => onAdd && onAdd(row)}