diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
index 97a620c1060..2ec36935355 100644
--- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
+++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js
@@ -6,6 +6,7 @@ const commonlocators = require("../../../../locators/commonlocators.json");
 
 import {
   agHelper,
+  assertHelper,
   dataSources,
   deployMode,
   homePage,
@@ -45,6 +46,7 @@ describe(
 
       //TestData & save datasource
       dataSources.TestSaveDatasource();
+      agHelper.WaitUntilAllToastsDisappear();
       // fetch bucket
       cy.wait("@getDatasourceStructure").should(
         "have.nested.property",
@@ -80,8 +82,7 @@ describe(
     });
 
     it("2. Generate CRUD page from datasource ACTIVE section", function () {
-      cy.NavigateToDSGeneratePage(datasourceName);
-
+      dataSources.GeneratePageForDS(datasourceName);
       // fetch bucket
       cy.wait("@getDatasourceStructure").should(
         "have.nested.property",
@@ -129,12 +130,12 @@ describe(
       cy.fillAmazonS3DatasourceForm();
 
       //TestData source
-      cy.get(".t--test-datasource").click();
-      cy.wait("@testDatasource");
+      dataSources.TestDatasource(true);
+      agHelper.WaitUntilAllToastsDisappear();
 
       //Save source
-      cy.get(".t--save-datasource").click();
-      cy.wait("@saveDatasource");
+      dataSources.SaveDatasource();
+      agHelper.WaitUntilAllToastsDisappear();
 
       //Verify page after save clicked
       // cy.get("@saveDatasource").then((httpResponse) => {
diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts
index 45f8985feb2..8eb08005eae 100644
--- a/app/client/cypress/support/Pages/DataSources.ts
+++ b/app/client/cypress/support/Pages/DataSources.ts
@@ -85,8 +85,8 @@ export class DataSources {
     "//div[text()='" + name + "']/parent::div";
   public _password =
     "input[name $= '.datasourceConfiguration.authentication.password']";
-  private _testDs = ".t--test-datasource";
-  _saveDs = ".t--save-datasource";
+  public _testDs = ".t--test-datasource";
+  public _saveDs = ".t--save-datasource";
   _datasourceCard = ".t--datasource";
   _dsMenuoptions = "div.t--datasource-menu-option";
   _editButton = ".t--edit-datasource";