diff --git a/docs/NooBaaNonContainerized/CI&Tests.md b/docs/NooBaaNonContainerized/CI&Tests.md
index cc8b4f088b..0fddf42a81 100644
--- a/docs/NooBaaNonContainerized/CI&Tests.md
+++ b/docs/NooBaaNonContainerized/CI&Tests.md
@@ -98,9 +98,9 @@ The following is a list of `NC jest tests` files -
 1. `test_nc_account_invalid_mkm_integration.test.js` - Tests NC invalid master key manager scenarios.  
 2. `test_nc_master_keys.test.js` - Tests NC master key manager (store type = file).  
 3. `test_nc_master_keys_exec.test.js` - Tests NC master key manager (store type = executable).  
-4. `test_nc_nsfs_bucket_cli.test.js` - Tests NooBaa CLI bucket commands.  
+4. `test_nc_bucket_cli.test.js` - Tests NooBaa CLI bucket commands.  
 5. `test_nc_account_cli.test.js` - Tests NooBaa CLI account commands.  
-6. `test_nc_nsfs_anonymous_cli.test.js` - Tests NooBaa CLI anonymous account commands.  
+6. `test_nc_anonymous_cli.test.js` - Tests NooBaa CLI anonymous account commands.  
 7. `test_nc_nsfs_config_schema_validation.test.js` - Tests NC config.json schema validation.  
 8. `test_nc_nsfs_bucket_schema_validation.test.js` - Tests NC bucket schema validation.  
 9. `test_nc_nsfs_account_schema_validation.test.js` - Tests NC account schema validation.  
@@ -114,6 +114,7 @@ The following is a list of `NC jest tests` files -
 17. `test_nc_upgrade_manager.test.js` - Tests of the NC upgrade manager.
 18. `test_cli_upgrade.test.js` - Tests of the upgrade CLI commands.
 19. `test_nc_online_upgrade_cli_integrations.test.js` - Tests CLI commands during mocked config directory upgrade.
+20. `test_nc_connection_cli.test.js` - Tests NooBaa CLI connection commands.
 
 #### nc_index.js File
 * The `nc_index.js` is a file that runs several NC and NSFS mocha related tests.  
diff --git a/src/test/unit_tests/jest_tests/test_nc_account_cli.test.js b/src/test/unit_tests/jest_tests/test_nc_account_cli.test.js
index f3d3a261f2..5c6d4bab6b 100644
--- a/src/test/unit_tests/jest_tests/test_nc_account_cli.test.js
+++ b/src/test/unit_tests/jest_tests/test_nc_account_cli.test.js
@@ -18,7 +18,7 @@ const { TYPES, ACTIONS, ANONYMOUS } = require('../../../manage_nsfs/manage_nsfs_
 const ManageCLIError = require('../../../manage_nsfs/manage_nsfs_cli_errors').ManageCLIError;
 const ManageCLIResponse = require('../../../manage_nsfs/manage_nsfs_cli_responses').ManageCLIResponse;
 
-const tmp_fs_path = path.join(TMP_PATH, 'test_nc_nsfs_account_cli');
+const tmp_fs_path = path.join(TMP_PATH, 'test_nc_account_cli');
 const timeout = 50000;
 const config = require('../../../../config');
 const config_fs_account_options = { show_secrets: true, decrypt_secret_key: true };
diff --git a/src/test/unit_tests/jest_tests/test_nc_account_invalid_mkm_integration.test.js b/src/test/unit_tests/jest_tests/test_nc_account_invalid_mkm_integration.test.js
index 5b8d04d84b..820e977976 100644
--- a/src/test/unit_tests/jest_tests/test_nc_account_invalid_mkm_integration.test.js
+++ b/src/test/unit_tests/jest_tests/test_nc_account_invalid_mkm_integration.test.js
@@ -12,7 +12,7 @@ const { TYPES, ACTIONS } = require('../../../manage_nsfs/manage_nsfs_constants')
 const ManageCLIError = require('../../../manage_nsfs/manage_nsfs_cli_errors').ManageCLIError;
 const ManageCLIResponse = require('../../../manage_nsfs/manage_nsfs_cli_responses').ManageCLIResponse;
 
-const tmp_fs_path = path.join(TMP_PATH, 'test_nc_nsfs_account_cli');
+const tmp_fs_path = path.join(TMP_PATH, 'test_nc_invalid_mkm_integration');
 const config_root = path.join(tmp_fs_path, 'config_root_account_mkm_integration');
 const root_path = path.join(tmp_fs_path, 'root_path_account_mkm_integration/');
 const defaults = {
diff --git a/src/test/unit_tests/jest_tests/test_nc_nsfs_anonymous_cli.test.js b/src/test/unit_tests/jest_tests/test_nc_anonymous_cli.test.js
similarity index 100%
rename from src/test/unit_tests/jest_tests/test_nc_nsfs_anonymous_cli.test.js
rename to src/test/unit_tests/jest_tests/test_nc_anonymous_cli.test.js
diff --git a/src/test/unit_tests/jest_tests/test_nc_nsfs_bucket_cli.test.js b/src/test/unit_tests/jest_tests/test_nc_bucket_cli.test.js
similarity index 100%
rename from src/test/unit_tests/jest_tests/test_nc_nsfs_bucket_cli.test.js
rename to src/test/unit_tests/jest_tests/test_nc_bucket_cli.test.js
diff --git a/src/test/unit_tests/jest_tests/test_nc_nsfs_connection_cli.test.js b/src/test/unit_tests/jest_tests/test_nc_connection_cli.test.js
similarity index 98%
rename from src/test/unit_tests/jest_tests/test_nc_nsfs_connection_cli.test.js
rename to src/test/unit_tests/jest_tests/test_nc_connection_cli.test.js
index 7e4207be99..28407d7526 100644
--- a/src/test/unit_tests/jest_tests/test_nc_nsfs_connection_cli.test.js
+++ b/src/test/unit_tests/jest_tests/test_nc_connection_cli.test.js
@@ -14,7 +14,7 @@ const { ConfigFS } = require('../../../sdk/config_fs');
 const { TMP_PATH, set_nc_config_dir_in_config } = require('../../system_tests/test_utils');
 const { TYPES, ACTIONS } = require('../../../manage_nsfs/manage_nsfs_constants');
 
-const tmp_fs_path = path.join(TMP_PATH, 'test_nc_nsfs_account_cli');
+const tmp_fs_path = path.join(TMP_PATH, 'test_nc_connection_cli.test');
 const timeout = 5000;
 
 // eslint-disable-next-line max-lines-per-function