diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 89c25eb55516..f7d59a8a065c 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -126,8 +126,6 @@
 
 SOURCE_DISPLAYED_CORRECTLY = "Source code displayed correctly"
 
-STEP_IN_SUCCEEDED = "Thread step-in succeeded"
-
 STEP_OUT_SUCCEEDED = "Thread step-out succeeded"
 
 STOPPED_DUE_TO_EXC_BAD_ACCESS = "Process should be stopped due to bad access exception"
diff --git a/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py b/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
deleted file mode 100644
index 0b59f625bd69..000000000000
--- a/lldb/test/API/lang/c/stepping/TestThreadStepInAvoidRegexp.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Test thread step-in [ -r | --step-over-regexp ].
-"""
-
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class ThreadStepInAvoidRegexTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        TestBase.setUp(self)
-        self.line2 = line_number('main.c', '// assignment to B2')
-
-    def test_step_out_avoid_regexp(self):
-        """Exercise thread step-in -r"""
-        self.build()
-        lldbutil.run_to_source_breakpoint(self,
-                'frame select 2, thread step-out while stopped',
-                lldb.SBFileSpec('main.c'))
-
-        # Now step in, skipping the frames for 'b' and 'a'.
-        self.runCmd("thread step-in -r 'a'")
-
-        # We should be at the assignment to B2.
-        self.expect("thread backtrace", STEP_IN_SUCCEEDED,
-                    substrs=["stop reason = step in"],
-                    patterns=["frame #0.*main.c:%d" % self.line2])
diff --git a/lldb/test/API/lang/c/stepping/main.c b/lldb/test/API/lang/c/stepping/main.c
index 8237ebf984c9..43b5cfab183a 100644
--- a/lldb/test/API/lang/c/stepping/main.c
+++ b/lldb/test/API/lang/c/stepping/main.c
@@ -39,7 +39,7 @@ int main (int argc, char const *argv[])
 {
     int A1 = a(1); // frame select 2, thread step-out while stopped at "c(1)"
 
-    int B2 = b(2); // assignment to B2
+    int B2 = b(2);
 
     int A3 = a(3); // frame select 1, thread step-out while stopped at "c(3)"