diff --git a/Objective-J/CommonJS/lib/objective-j.js b/Objective-J/CommonJS/lib/objective-j.js
index 747e53dc1..fbe2c2d81 100644
--- a/Objective-J/CommonJS/lib/objective-j.js
+++ b/Objective-J/CommonJS/lib/objective-j.js
@@ -94,7 +94,7 @@ exports.run = function(args)
             print("  -I, --objj-include-paths       include a specific framework paths")
             print("  -h, --help                     print this help");
             print("  -m, --multifiles               launch objj on several files")
-            print("  --xml-output-format            specify the output format in xml.")
+            print("  -x, --xml                      specify the output format in xml.")
             return;
         }
 
@@ -114,6 +114,7 @@ exports.run = function(args)
                     multipleFiles = true;
                     break
 
+                case "-x":
                 case "--xml-output-format":
                     argv.shift();
                     exports.outputFormatInXML = true;
diff --git a/Tests/Tools/ToolsTest.j b/Tests/Tools/ToolsTest.j
index ea2966173..fe05f692c 100644
--- a/Tests/Tools/ToolsTest.j
+++ b/Tests/Tools/ToolsTest.j
@@ -47,10 +47,10 @@ function cleanup() {
     status = OS.system(["objj", "ToolsTestApp/AppController.j"]);
     [self assert:0 equals:status message:"objj failed"];
 
-    status = OS.system(["objj", "--xml-output-format", "ToolsTestApp/AppController.j"]);
+    status = OS.system(["objj", "-x", "ToolsTestApp/AppController.j"]);
     [self assert:0 equals:status message:"objj failed"];
 
-    var p = OS.popen(["objj", "--xml-output-format", "objjErrorTestFile.j"]);
+    var p = OS.popen(["objj", "--xml", "objjErrorTestFile.j"]);
     [self assert:1 equals:p.wait() message:"objj failed"];
     [self assert:"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"><plist version = \"1.0\"><array><dict><key>line</key><integer>1</integer><key>path</key><string>" + rootDirectory + "/objjErrorTestFile.j</string><key>message</key><string>Can&apos;t find superclass CPObject</string></dict></array></plist>\n" equals:p.stdout.read() message:"objj failed"];