Index: lldb/packages/Python/lldbsuite/test/dotest.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/dotest.py
+++ lldb/packages/Python/lldbsuite/test/dotest.py
@@ -1021,10 +1021,17 @@
     checkDebugInfoSupport()
 
     # Don't do debugserver tests on anything except OS X.
-    configuration.dont_do_debugserver_test = "linux" in target_platform or "freebsd" in target_platform or "windows" in target_platform
+    configuration.dont_do_debugserver_test = (
+            "linux" in target_platform or
+            "freebsd" in target_platform or
+            "netbsd" in target_platform or
+            "windows" in target_platform)
 
     # Don't do lldb-server (llgs) tests on anything except Linux and Windows.
-    configuration.dont_do_llgs_test = not ("linux" in target_platform) and not ("windows" in target_platform)
+    configuration.dont_do_llgs_test = not (
+            "linux" in target_platform or
+            "netbsd" in target_platform or
+            "windows" in target_platform)
 
     # Collect tests from the specified testing directories. If a test
     # subdirectory filter is explicitly specified, limit the search to that
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
@@ -59,6 +59,7 @@
         self.set_inferior_startup_attach_manually()
         self.attach_with_vAttach()
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_attach_with_vAttach_llgs(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -129,6 +129,7 @@
         self.auxv_data_is_correct_size()
 
     @skipIfWindows
+    @expectedFailureNetBSD
     @llgs_test
     def test_auxv_data_is_correct_size_llgs(self):
         self.init_llgs_test()
@@ -168,6 +169,7 @@
         self.auxv_keys_look_valid()
 
     @skipIfWindows
+    @expectedFailureNetBSD
     @llgs_test
     def test_auxv_keys_look_valid_llgs(self):
         self.init_llgs_test()
@@ -216,6 +218,7 @@
         self.auxv_chunked_reads_work()
 
     @skipIfWindows
+    @expectedFailureNetBSD
     @llgs_test
     def test_auxv_chunked_reads_work_llgs(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -52,6 +52,7 @@
         self.set_inferior_startup_attach()
         self.attach_commandline_kill_after_initial_stop()
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_attach_commandline_kill_after_initial_stop_llgs(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -75,6 +75,7 @@
         self.set_inferior_startup_attach()
         self.attach_commandline_qProcessInfo_reports_correct_pid()
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_attach_commandline_qProcessInfo_reports_correct_pid_llgs(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteTwoThreadsInvCont.py
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteTwoThreadsInvCont.py
@@ -0,0 +1,38 @@
+from __future__ import print_function
+
+import json
+import re
+
+import gdbremote_testcase
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class TestGdbRemoteTwoThreadsInvCont(
+        gdbremote_testcase.GdbRemoteTestCaseBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def signal_two_threads(self):
+        procs = self.prep_debug_monitor_and_inferior(
+            inferior_args=['thread:new', 'thread:new', 'thread:new',
+                'sleep:10'])
+        self.test_sequence.add_log_lines([
+            "read packet: $c#63"
+        ], True)
+        context = self.expect_gdbremote_sequence()
+        self.assertIsNotNone(context)
+
+    @debugserver_test
+    def test_signal_two_threads_debugserver(self):
+        self.init_debugserver_test()
+        self.build()
+        self.set_inferior_startup_launch()
+        self.signal_two_threads()
+
+    @llgs_test
+    def test_signal_two_threads_llgs(self):
+        self.init_llgs_test()
+        self.build()
+        self.set_inferior_startup_launch()
+        self.signal_two_threads()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -164,6 +164,7 @@
         self.qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt(
             self.THREAD_COUNT)
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt_llgs(
             self):
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
@@ -113,18 +113,21 @@
 
     @llgs_test
     @skipUnlessPlatform(["linux", "android", "netbsd"])
+    @expectedFailureNetBSD
     def test_libraries_svr4_well_formed(self):
         self.setup_test()
         self.libraries_svr4_well_formed()
 
     @llgs_test
     @skipUnlessPlatform(["linux", "android", "netbsd"])
+    @expectedFailureNetBSD
     def test_libraries_svr4_load_addr(self):
         self.setup_test()
         self.libraries_svr4_has_correct_load_addr()
 
     @llgs_test
     @skipUnlessPlatform(["linux", "android", "netbsd"])
+    @expectedFailureNetBSD
     def test_libraries_svr4_libs_present(self):
         self.setup_test()
         self.libraries_svr4_libs_present()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
@@ -138,6 +138,7 @@
         self.assertEqual(
             ['0x727476787a7c7e71', '0x737577797b7d7f70'], get_reg_value('xmm15'))
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_g_returns_correct_data_with_suffix_llgs(self):
         self.init_llgs_test()
@@ -145,6 +146,7 @@
         self.set_inferior_startup_launch()
         self.g_returns_correct_data(True)
 
+    @expectedFailureNetBSD
     @llgs_test
     def test_g_returns_correct_data_no_suffix_llgs(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
@@ -82,6 +82,7 @@
         self.expect_exit_code(len(signals_to_ignore))
 
     @skipIfWindows # no signal support
+    @expectedFailureNetBSD
     @llgs_test
     def test_default_signals_behavior(self):
         self.init_llgs_test()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
@@ -30,6 +30,7 @@
         self.assertEqual(expected_name, kv_dict.get("name"))
 
     @skipIfWindows # the test is not updated for Windows.
+    @skipIfNetBSD # build failure due to pthread_setname_np prototype
     @llgs_test
     def test(self):
         """ Make sure lldb-server can retrieve inferior thread name"""