diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index ded03fd8f..48701b2ea 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -303,7 +303,8 @@ describe('Data browser data', () => {
   });
 
   it('Plugin tab', () => {
-    cy.testid('WidgetIconPanel_plugins').click();
+    cy.testid('WidgetIconPanel_settings').click();
+    cy.contains('Manage plugins').click();
     cy.contains('dbgate-plugin-theme-total-white').click();
     // text from plugin markdown
     cy.contains('Total white theme');
@@ -380,20 +381,17 @@ describe('Data browser data', () => {
     cy.themeshot('compare-database-settings');
   });
 
-  it('Query editor - AI assistant', () => {
+  it.only('Database chat', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.testid('TabsPanel_buttonNewObject').click();
-    cy.testid('NewObjectModal_query').click();
-    cy.testid('QueryTab_switchAiAssistantButton').click();
-    cy.testid('QueryAiAssistant_allowSendToAiServiceButton').click();
-    cy.testid('ConfirmModal_okButton').click();
-    cy.testid('QueryAiAssistant_promptInput').type('album names');
-    cy.testid('QueryAiAssistant_queryFromQuestionButton').click();
-    cy.contains('Use this', { timeout: 10000 }).click();
-    cy.testid('QueryTab_executeButton').click();
-    cy.contains('Balls to the Wall');
-    cy.themeshot('ai-assistant');
+    cy.testid('NewObjectModal_databaseChat').click();
+    cy.wait(1000);
+    cy.get('body').realType('find most popular artist');
+    cy.get('body').realPress('{enter}');
+    cy.testid('DatabaseChatTab_executeThisQuery', { timeout: 20000 }).click();
+    cy.contains('Iron Maiden');
+    cy.themeshot('database-chat');
   });
 
   it('Modify data', () => {
diff --git a/packages/web/src/modals/NewObjectModal.svelte b/packages/web/src/modals/NewObjectModal.svelte
index 83a9691d1..3995d1129 100644
--- a/packages/web/src/modals/NewObjectModal.svelte
+++ b/packages/web/src/modals/NewObjectModal.svelte
@@ -113,6 +113,7 @@
       command: 'database.chat',
       isProFeature: true,
       disabledMessage: 'Database chat is not available for current database',
+      testid: 'NewObjectModal_databaseChat',
     }
   ];
 </script>