diff --git a/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts b/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
index 1f3673a43a..cfddc5bf5c 100644
--- a/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
+++ b/tests/e2e/tests/critical-path/cli/cli-critical.e2e.ts
@@ -86,3 +86,26 @@ test('Verify that user can scroll commands using "Tab" in CLI & execute it', asy
     //Check that command was executed and user got success result
     await t.expect(cliPage.cliOutputResponseSuccess.exists).ok('Command from autocomplete was found & executed');
 });
+test('Verify that when user enters in CLI RediSearch/JSON commands (FT.CREATE, FT.DROPINDEX/JSON.GET, JSON.DEL), he can see hints with arguments', async t => {
+    const commandHints =[
+        'index [ON HASH|JSON] [PREFIX count prefix [prefix ...]] [LANGUAGE default_lang] [LANGUAGE_FIELD lang_attribute] [SCORE default_score] [SCORE_FIELD score_attribute] [PAYLOAD_FIELD payload_attribute] [MAXTEXTFIELDS] [TEMPORARY seconds] [NOOFFSETS] [NOHL] [NOFIELDS] [NOFREQS] [count stopword [stopword ...]] SCHEMA field_name [AS alias] TEXT|TAG|NUMERIC|GEO [SORTABLE [UNF]] [NOINDEX]',
+        'index [DD]',
+        'key [INDENT indent] [NEWLINE newline] [SPACE space] [paths [paths ...]]',
+        'key [path]'
+    ];
+    const commands = [
+        'FT.CREATE',
+        'FT.DROPINDEX',
+        'JSON.GET',
+        'JSON.DEL'
+    ];
+    await addNewStandaloneDatabase(ossStandaloneConfig);
+    await myRedisDatabasePage.clickOnDBByName(ossStandaloneConfig.databaseName);
+    //Open CLI
+    await t.click(cliPage.cliExpandButton);
+    //Enter commands and check hints with arguments
+    for(let command of commands) {
+        await t.typeText(cliPage.cliCommandInput, command, { replace: true });
+        await t.expect(cliPage.cliCommandAutocomplete.textContent).eql(commandHints[commands.indexOf(command)], `The hints with arguments for command ${command}`);
+    }
+});
diff --git a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts
index 275bb4f593..92769495b6 100644
--- a/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts
+++ b/tests/e2e/tests/smoke/browser/verify-key-details.e2e.ts
@@ -113,10 +113,10 @@ test('Verify that user can see ZSet Key details', async t => {
     const keyTTLValue = await browserPage.keyDetailsTTL.textContent;
 
     await t.expect(keyNameFromDetails).contains(keyName, 'The Key Name');
-    await t.expect(keyDetails).contains('Zset', 'The Key Type');
+    await t.expect(keyDetails).contains('Sorted Set', 'The Key Type');
     await t.expect(keyDetails).contains('TTL', 'The TTL');
     await t.expect(keyTTLValue).contains(keyTTL, 'The Key TTL');
-    await t.expect(keyBadge).contains('Zset', 'The Key Badge');
+    await t.expect(keyBadge).contains('Sorted Set', 'The Key Badge');
 });
 test('Verify that user can see JSON Key details', async t => {
     const keyName = 'JSON1testKeyForEdit';