diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_Tests_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_Tests_spec.ts
index 894984ab18..abbc333ad3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_Tests_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/JSObject/JSObject_Tests_spec.ts
@@ -236,7 +236,7 @@ describe("Validate JSObj", { tags: ["@tag.JS", "@tag.Datasource"] }, () => {
     debuggerHelper.DoesConsoleLogExist("Operation was successful!");
   });
 
-  it.skip("8. Verify Queries", () => {
+  it("8. Verify Queries", () => {
     dataSources.CreateDataSource("Postgres");
     dataSources.CreateQueryAfterDSSaved(" ");
     agHelper.TypeIntoTextArea(locators._codeEditorTarget, "/");
@@ -247,21 +247,28 @@ describe("Validate JSObj", { tags: ["@tag.JS", "@tag.Datasource"] }, () => {
     agHelper.GetNAssertContains(locators._hints, "MainContainer");
 
     cy.get("@guid").then((uid) => {
-      dataSources.GeneratePageForDS(`Postgres ${uid}`);
+      EditorNavigation.SelectEntityByName(
+        `Postgres ${uid}`,
+        EntityType.Datasource,
+      );
+      dataSources.SelectTableFromPreviewSchemaList("public.users");
+      agHelper.GetNClick(dataSources._datasourceCardGeneratePageBtn);
     });
     assertHelper.AssertNetworkStatus("@postExecute", 200);
     agHelper.ClickButton("Got it");
     assertHelper.AssertNetworkStatus("@updateLayout", 200);
     agHelper.Sleep(2000);
     table.WaitUntilTableLoad(0, 0, "v2");
-    EditorNavigation.SelectEntityByName("SelectQuery", EntityType.Query);
+    EditorNavigation.SelectEntityByName("DeleteQuery", EntityType.Query);
     agHelper.GetNClick(locators._codeEditorTarget);
     agHelper.AssertElementVisibility(locators._evaluatedValue);
 
     cy.get(`${locators._codeMirrorCode} pre`).then(($elements) => {
       const text = [...$elements].map((el) => el.innerText).join("");
       agHelper.GetText(locators._evaluatedValue).then((evalText: any) => {
-        expect(evalText.replace(/\n/g, "")).to.eq(text);
+        expect(evalText.replace(/\n/g, "")).to.eq(
+          'DELETE FROM public."users"  WHERE "id" = $1;',
+        );
       });
     });
   });