diff --git a/src/App/Application.cpp b/src/App/Application.cpp
index 3468e20a87..6d7d6667c2 100644
--- a/src/App/Application.cpp
+++ b/src/App/Application.cpp
@@ -2160,7 +2160,7 @@ void parseProgramOptions(int ac, char ** av, const string& exe, variables_map& v
     ("log-file", value<string>(), "Unlike --write-log this allows logging to an arbitrary file")
     ("user-cfg,u", value<string>(),"User config file to load/save user settings")
     ("system-cfg,s", value<string>(),"System config file to load/save system settings")
-    ("run-test,t",   value<string>()   ,"Test case - or 0 for all")
+    ("run-test,t", value<string>()->implicit_value(""),"Run a given test case (use 0 (zero) to run all tests). If no argument is provided then return list of all available tests.")
     ("module-path,M", value< vector<string> >()->composing(),"Additional module paths")
     ("python-path,P", value< vector<string> >()->composing(),"Additional python paths")
     ("single-instance", "Allow to run a single instance of the application")
@@ -2394,6 +2394,9 @@ void processProgramOptions(const variables_map& vm, std::map<std::string,std::st
         if ( "0" == testCase) {
             testCase = "TestApp.All";
         }
+        else if (testCase.empty()) {
+            testCase = "TestApp.PrintAll";
+        }
         mConfig["TestCase"] = testCase;
         mConfig["RunMode"] = "Internal";
         mConfig["ScriptFileName"] = "FreeCADTest";
diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py
index 6d20f17777..806681d258 100644
--- a/src/Mod/Test/TestApp.py
+++ b/src/Mod/Test/TestApp.py
@@ -63,6 +63,19 @@ def All():
 
     return suite
 
+def PrintAll():
+    # Registered tests
+    tests = FreeCAD.__unit_test__
+
+    suite = unittest.TestSuite()
+
+    FreeCAD.Console.PrintMessage("\nRegistered test units:\n\n")
+    for test in tests:
+        FreeCAD.Console.PrintMessage(("%s\n" % test))
+    FreeCAD.Console.PrintMessage("\nPlease choose one or use 0 for all\n")
+
+    return suite
+
 
 def TestText(s):
     s = unittest.defaultTestLoader.loadTestsFromName(s)