diff --git a/.github/workflows/test-matrix.yml b/.github/workflows/test-matrix.yml
index 2dd93eed..d04b8a97 100644
--- a/.github/workflows/test-matrix.yml
+++ b/.github/workflows/test-matrix.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   tests:
     strategy:
+      fail-fast: false
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
diff --git a/bin/near-cli.js b/bin/near-cli.js
index df0dd43d..c757c20c 100644
--- a/bin/near-cli.js
+++ b/bin/near-cli.js
@@ -21,8 +21,8 @@ yargs // eslint-disable-line
     .command(require('../commands/account/state'))
     .command(require('../commands/contract/storage'))
     .command(require('../commands/transactions/status'))
-    .command(require('../commands/transactions/stake'))
-    .command(require('../commands/validators'))
+    .command(require('../commands/validators/stake'))
+    .command(require('../commands/validators/validators'))
     .command(require('../commands/contract/view'))
     .command(require('../commands/deprecated'))
     .option('verbose', { alias: ['v'], desc: 'Prints out verbose output', type: 'boolean', default: false })
diff --git a/commands/transactions/stake.js b/commands/validators/stake.js
similarity index 98%
rename from commands/transactions/stake.js
rename to commands/validators/stake.js
index 7f93b84a..343dc63a 100644
--- a/commands/transactions/stake.js
+++ b/commands/validators/stake.js
@@ -8,6 +8,7 @@ const { DEFAULT_NETWORK } = require('../../config');
 
 module.exports = {
     command: 'validator-stake accountId stakingKey amount',
+    aliases: ['stake'],
     desc: 'Create a staking transaction (for **validators** only)',
     builder: (yargs) => yargs
         .option('accountId', {
diff --git a/commands/validators.js b/commands/validators/validators.js
similarity index 87%
rename from commands/validators.js
rename to commands/validators/validators.js
index 4cfb86e6..484b053d 100644
--- a/commands/validators.js
+++ b/commands/validators/validators.js
@@ -1,6 +1,6 @@
-const { DEFAULT_NETWORK } = require('../config');
-const connect = require('../utils/connect');
-const validatorsInfo = require('../utils/validators-info');
+const { DEFAULT_NETWORK } = require('../../config');
+const connect = require('../../utils/connect');
+const validatorsInfo = require('../../utils/validators-info');
 
 module.exports = {
     command: 'validators <search>',