diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index f0aa26a8f01b..a698efa24ac1 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -91,9 +91,6 @@ bmBreakpointSpec = None
 # The benchmark iteration count, as specified by the '-y' option.
 bmIterationCount = -1
 
-# By default, failfast is False.  Use '-F' to overwrite it.
-failfast = False
-
 # The filters (testclass.testmethod) used to admit tests into our test suite.
 filters = []
 
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 5ba9a46fc0df..342f41354481 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -305,9 +305,6 @@ def parseOptionsAndInitTestdirs():
         sys.stdout.flush()
         os.kill(os.getpid(), signal.SIGSTOP)
 
-    if args.F:
-        configuration.failfast = True
-
     if args.f:
         if any([x.startswith('-') for x in args.f]):
             usage(parser)
@@ -1265,7 +1262,6 @@ def run_suite():
             if configuration.count == 1:
                 result = unittest2.TextTestRunner(stream=sys.stderr,
                                                   verbosity=v,
-                                                  failfast=configuration.failfast,
                                                   resultclass=test_result.LLDBTestResult).run(configuration.suite)
             else:
                 # We are invoking the same test suite more than once.  In this case,
@@ -1276,7 +1272,6 @@ def run_suite():
                
                     result = unittest2.TextTestRunner(stream=sys.stderr,
                                                       verbosity=v,
-                                                      failfast=configuration.failfast,
                                                       resultclass=test_result.LLDBTestResult).run(configuration.suite)
 
             configuration.failed = configuration.failed or not result.wasSuccessful()
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 7c1ca9ed8d28..5f58ab560965 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -88,7 +88,6 @@ def create_parser():
     # Test-suite behaviour
     group = parser.add_argument_group('Runtime behaviour options')
     X('-d', 'Suspend the process after launch to wait indefinitely for a debugger to attach')
-    X('-F', 'Fail fast. Stop the test suite on the first error/failure')
     X('-i', "Ignore (don't bailout) if 'lldb.py' module cannot be located in the build tree relative to this script; use PYTHONPATH to locate the module")
     X('-n', "Don't print the headers like build dir, lldb version, and svn info at all")
     X('-P', "Use the graphic progress bar.")