diff --git a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
index d8d567a1f6d6..ce027b7e2ecd 100644
--- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
@@ -63,21 +63,21 @@ class ConcurrentEventsTestCase(TestBase):
     #
     ## Tests for concurrent signal and breakpoint
     #
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_signal_break_dwarf(self):
         """Test signal and a breakpoint in multiple threads."""
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.do_thread_actions(num_breakpoint_threads=1, num_signal_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_delay_signal_break_dwarf(self):
         """Test (1-second delay) signal and a breakpoint in multiple threads."""
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.do_thread_actions(num_breakpoint_threads=1, num_delay_signal_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_signal_delay_break_dwarf(self):
         """Test signal and a (1 second delay) breakpoint in multiple threads."""
@@ -142,14 +142,14 @@ class ConcurrentEventsTestCase(TestBase):
     #
     ## Tests for multiple breakpoint threads
     #
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_two_breakpoint_threads_dwarf(self):
         """Test two threads that trigger a breakpoint. """
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.do_thread_actions(num_breakpoint_threads=2)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_breakpoint_one_delay_breakpoint_threads_dwarf(self):
         """Test threads that trigger a breakpoint where one thread has a 1 second delay. """
@@ -157,14 +157,14 @@ class ConcurrentEventsTestCase(TestBase):
         self.do_thread_actions(num_breakpoint_threads=1,
                                num_delay_breakpoint_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_two_breakpoints_one_signal_dwarf(self):
         """Test two threads that trigger a breakpoint and one signal thread. """
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.do_thread_actions(num_breakpoint_threads=2, num_signal_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_breakpoint_delay_breakpoint_one_signal_dwarf(self):
         """Test two threads that trigger a breakpoint (one with a 1 second delay) and one signal thread. """
@@ -173,7 +173,7 @@ class ConcurrentEventsTestCase(TestBase):
                                num_delay_breakpoint_threads=1,
                                num_signal_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_two_breakpoints_one_delay_signal_dwarf(self):
         """Test two threads that trigger a breakpoint and one (1 second delay) signal thread. """
@@ -286,7 +286,7 @@ class ConcurrentEventsTestCase(TestBase):
     #
     ## Test for crashing threads happening concurrently with other events
     #
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_crash_with_break_dwarf(self):
         """ Test a thread that crashes while another thread hits a breakpoint."""
@@ -301,7 +301,7 @@ class ConcurrentEventsTestCase(TestBase):
         self.buildDwarf(dictionary=self.getBuildFlags())
         self.do_thread_actions(num_crash_threads=1, num_watchpoint_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_crash_with_signal_dwarf(self):
         """ Test a thread that crashes while another thread generates a signal."""
@@ -329,7 +329,7 @@ class ConcurrentEventsTestCase(TestBase):
                                num_breakpoint_threads=1,
                                num_watchpoint_threads=1)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_delayed_crash_with_breakpoint_signal_dwarf(self):
         """ Test a thread with a delayed crash while other threads generate a signal and hit a breakpoint. """
diff --git a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
index 12cbd806c250..9e47282aaed8 100644
--- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
@@ -18,7 +18,7 @@ class ThreadStepOutTestCase(TestBase):
         self.buildDsym(dictionary=self.getBuildFlags())
         self.step_out_test(self.step_out_single_thread_with_cmd)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_step_single_thread_with_dwarf(self):
         """Test thread step out on one thread via command interpreter. """
@@ -31,7 +31,7 @@ class ThreadStepOutTestCase(TestBase):
         self.buildDsym(dictionary=self.getBuildFlags())
         self.step_out_test(self.step_out_all_threads_with_cmd)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_step_all_threads_with_dwarf(self):
         """Test thread step out on all threads via command interpreter. """
@@ -44,7 +44,7 @@ class ThreadStepOutTestCase(TestBase):
         self.buildDsym(dictionary=self.getBuildFlags())
         self.step_out_test(self.step_out_with_python)
 
-    @expectedFailureFreeBSD("llvm.org/pr16696") # threaded inferior not yet implemented on FreeBSD
+    @expectedFailureFreeBSD("llvm.org/pr17910") # fails to build
     @dwarf_test
     def test_python_with_dwarf(self):
         """Test thread step out on one thread via Python API (dwarf)."""