diff --git a/llvm/utils/lit/lit/formats/googletest.py b/llvm/utils/lit/lit/formats/googletest.py
index 059eb99762e9..67f32cf1cdf7 100644
--- a/llvm/utils/lit/lit/formats/googletest.py
+++ b/llvm/utils/lit/lit/formats/googletest.py
@@ -41,14 +41,6 @@ class GoogleTest(TestFormat):
             litConfig.warning(
                 "unable to discover google-tests in %r: %s. Process output: %s"
                 % (path, sys.exc_info()[1], exc.output))
-            # This doesn't look like a valid gtest file.  This can
-            # have a number of causes, none of them good.  For
-            # instance, we could have created a broken executable.
-            # Alternatively, someone has cruft in their test
-            # directory.  If we don't return a test here, then no
-            # failures will get reported, so return a dummy test name
-            # so that the failure is reported later.
-            yield 'failed_to_discover_tests_from_gtest'
             return
 
         nested_tests = []
diff --git a/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/lit.cfg b/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/lit.cfg
deleted file mode 100644
index 66be8ec33388..000000000000
--- a/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/lit.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-import lit.formats
-config.name = 'googletest-discovery-failed'
-config.test_format = lit.formats.GoogleTest('subdir', 'Test')
diff --git a/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/subdir/OneTest.py b/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/subdir/OneTest.py
deleted file mode 100644
index 4816459dee45..000000000000
--- a/llvm/utils/lit/tests/Inputs/googletest-discovery-failed/subdir/OneTest.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-
-raise SystemExit("We are not a valid gtest executable!")
diff --git a/llvm/utils/lit/tests/googletest-discovery-failed.py b/llvm/utils/lit/tests/googletest-discovery-failed.py
deleted file mode 100644
index a8b7921f1571..000000000000
--- a/llvm/utils/lit/tests/googletest-discovery-failed.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Check for correct error message when discovery of tests fails.
-#
-# RUN: not %{lit} -j 1 -v %{inputs}/googletest-discovery-failed > %t.cmd.out
-# RUN: FileCheck < %t.cmd.out %s
-
-
-# CHECK: -- Testing:
-# CHECK: Failing Tests (1):
-# CHECK:   googletest-discovery-failed :: subdir/OneTest.py/failed_to_discover_tests_from_gtest
-# CHECK: Unexpected Failures: 1