diff --git a/internal/cli/root.go b/internal/cli/root.go
index 9a9e113de..7088385e5 100644
--- a/internal/cli/root.go
+++ b/internal/cli/root.go
@@ -62,10 +62,10 @@ func Execute() {
 	rootCmd.AddCommand(quickstartCmd(cli))
 	rootCmd.AddCommand(clientsCmd(cli))
 	rootCmd.AddCommand(apisCmd(cli))
-	rootCmd.AddCommand(tryLoginCmd(cli))
+	rootCmd.AddCommand(testLoginCmd(cli))
 	rootCmd.AddCommand(logsCmd(cli))
 	rootCmd.AddCommand(actionsCmd(cli))
-	rootCmd.AddCommand(getTokenCmd(cli))
+	rootCmd.AddCommand(testTokenCmd(cli))
 
 	// keep completion at the bottom:
 	rootCmd.AddCommand(completionCmd(cli))
diff --git a/internal/cli/try_login.go b/internal/cli/test_login.go
similarity index 95%
rename from internal/cli/try_login.go
rename to internal/cli/test_login.go
index 27bd2401a..b3356ac9a 100644
--- a/internal/cli/try_login.go
+++ b/internal/cli/test_login.go
@@ -8,14 +8,14 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func tryLoginCmd(cli *cli) *cobra.Command {
+func testLoginCmd(cli *cli) *cobra.Command {
 	var clientID string
 	var connectionName string
 
 	cmd := &cobra.Command{
-		Use:   "try-login",
+		Use:   "test login",
 		Short: "Try out your universal login box",
-		Long: `auth0 try-login
+		Long: `auth0 test login
 Launch a browser to try out your universal login box for the given client.
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/internal/cli/get_token.go b/internal/cli/test_token.go
similarity index 96%
rename from internal/cli/get_token.go
rename to internal/cli/test_token.go
index 11ed04da5..1448d3c1e 100644
--- a/internal/cli/get_token.go
+++ b/internal/cli/test_token.go
@@ -6,15 +6,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func getTokenCmd(cli *cli) *cobra.Command {
+func testTokenCmd(cli *cli) *cobra.Command {
 	var clientID string
 	var audience string
 	var scopes []string
 
 	cmd := &cobra.Command{
-		Use:   "get-token",
+		Use:   "test token",
 		Short: "Fetch a token for the given client and API",
-		Long: `auth0 get-token
+		Long: `auth0 test token
 Fetch an access token for the given client and API.
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {