diff --git a/lib/terraspace/cli.rb b/lib/terraspace/cli.rb
index 44582920..5431fbc0 100644
--- a/lib/terraspace/cli.rb
+++ b/lib/terraspace/cli.rb
@@ -66,13 +66,19 @@ def bundle(*args)
       Bundle.new(options.merge(args: args)).run
     end
 
+    desc "check", "Check setup.", hide: true
+    long_desc Help.text(:check_setup)
+    def check
+      Check.new(options).run
+    end
+
     desc "check_setup", "Check setup.", hide: true
     long_desc Help.text(:check_setup)
     def check_setup
       puts <<~EOL
         DEPRECATED: The terraspace check_setup command is deprecated. Instead use:
 
-            terraspace setup check
+            terraspace check
 
       EOL
       Check.new(options).run
diff --git a/lib/terraspace/cli/setup.rb b/lib/terraspace/cli/setup.rb
index 12e9dcf3..1191fdb2 100644
--- a/lib/terraspace/cli/setup.rb
+++ b/lib/terraspace/cli/setup.rb
@@ -3,6 +3,12 @@ class Setup < Terraspace::Command
     desc "check", "Check setup is ok"
     long_desc Help.text("setup/check")
     def check
+      puts <<~EOL
+        DEPRECATED: The terraspace setup check command is deprecated. Instead use:
+
+            terraspace check
+
+      EOL
       Terraspace::Check.new(options).run
     end
   end