--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -65,30 +65,24 @@ def run_marionette(tests, binary=None, t
     failed = MarionetteHarness(MarionetteTestRunner, args=vars(args)).run()
     if failed > 0:
         return 1
     else:
         return 0
 
 
 @CommandProvider
-class MachCommands(MachCommandBase):
-
-    """Deprecated in favour of ./mach marionette <subcommand>."""
-
+class MarionetteTest(MachCommandBase):
     @Command("marionette-test",
              category="testing",
              description="Remote control protocol to Gecko, used for functional UI tests and browser automation.",
              conditions=[is_firefox_or_android],
              parser=create_parser_tests,
              )
-    def run_marionette_test(self, tests, **kwargs):
-        print("warning: ./mach marionette-test is deprecated; "
-              "please use ./mach marionette test", file=sys.stderr)
-
+    def marionette_test(self, tests, **kwargs):
         if "test_objects" in kwargs:
             tests = []
             for obj in kwargs["test_objects"]:
                 tests.append(obj["file_relpath"])
             del kwargs["test_objects"]
 
         if not kwargs.get("binary") and conditions.is_firefox(self):
             kwargs["binary"] = self.get_binary_path("app")