Index: lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
+++ lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
@@ -12,6 +12,7 @@
 class AproposWithProcessTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
+++ lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
@@ -12,6 +12,7 @@
 class NestedAliasTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
+++ lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
@@ -11,6 +11,7 @@
 class CommandScriptAliasTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def test_pycmd(self):
         self.runCmd("command script import tcsacmd.py")
Index: lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
+++ lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
@@ -13,6 +13,7 @@
 class TestCalculatorMode(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def test__calculator_mode(self):
         """Test calling expressions in the dummy target."""
Index: lldb/packages/Python/lldbsuite/test/commands/gui/basic/TestGuiBasic.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/gui/basic/TestGuiBasic.py
+++ lldb/packages/Python/lldbsuite/test/commands/gui/basic/TestGuiBasic.py
@@ -10,6 +10,7 @@
 class BasicGuiCommandTest(PExpectTest):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     # PExpect uses many timeouts internally and doesn't play well
     # under ASAN on a loaded machine..
Index: lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
+++ lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
@@ -15,6 +15,7 @@
 class ProcessListTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     NO_DEBUG_INFO_TESTCASE = True
 
Index: lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
+++ lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
@@ -15,6 +15,7 @@
 class AttachResumeTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @skipIfRemote
     @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr19310')
Index: lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
+++ lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
@@ -13,6 +13,7 @@
 class LaunchWithShellExpandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(
         oslist=[
Index: lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
+++ lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
@@ -2,4 +2,4 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(
-    __file__, globals(), [])
+    __file__, globals(), [decorators.no_debug_info_test])
Index: lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
+++ lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
@@ -11,6 +11,7 @@
 class NoSuchArchTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def test(self):
         self.build()
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
@@ -14,6 +14,7 @@
 class HelloWatchLocationTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -13,6 +13,7 @@
 class HelloWatchpointTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -11,6 +11,7 @@
 class TestStepOverWatchpoint(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @expectedFailureAll(
         oslist=["linux"],
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@@ -14,6 +14,7 @@
 class WatchedVariableHitWhenInScopeTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     # This test depends on not tracking watchpoint expression hits if we have
     # left the watchpoint scope.  We will provide such an ability at some point
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
@@ -13,6 +13,7 @@
 class WatchpointCommandsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -13,6 +13,7 @@
 class WatchpointLLDBCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -14,6 +14,7 @@
 class WatchpointPythonCommandTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -13,6 +13,7 @@
 class WatchpointConditionCmdTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
@@ -10,6 +10,7 @@
 
 class TestWatchpointSetEnable(TestBase):
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def test_disable_works (self):
         """Set a watchpoint, disable it, and make sure it doesn't get hit."""
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
@@ -12,6 +12,7 @@
 class TestWatchpointEvents (TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
@@ -13,6 +13,7 @@
 class TestValueOfVectorVariableTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def test_value_of_vector_variable_using_watchpoint_set(self):
         """Test verify displayed value of vector variable."""
Index: lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -13,6 +13,7 @@
 class WatchLocationUsingWatchpointSetTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py
+++ lldb/packages/Python/lldbsuite/test/lang/c/offsetof/TestOffsetof.py
@@ -1,3 +1,4 @@
 from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.no_debug_info_test])
Index: lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py
+++ lldb/packages/Python/lldbsuite/test/lang/cpp/offsetof/TestOffsetofCpp.py
@@ -1,3 +1,4 @@
 from lldbsuite.test import lldbinline
+from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.no_debug_info_test])
Index: lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
@@ -12,9 +12,9 @@
 class DebuggerAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_debugger_api_boundary_condition(self):
         """Exercise SBDebugger APIs with boundary conditions."""
         self.dbg.HandleCommand(None)
Index: lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -23,9 +23,9 @@
 class APIDefaultConstructorTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBAddress(self):
         obj = lldb.SBAddress()
         if self.TraceOn():
@@ -36,7 +36,6 @@
         sb_address.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBBlock(self):
         obj = lldb.SBBlock()
         if self.TraceOn():
@@ -47,7 +46,6 @@
         sb_block.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBBreakpoint(self):
         obj = lldb.SBBreakpoint()
         if self.TraceOn():
@@ -58,7 +56,6 @@
         sb_breakpoint.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBBreakpointLocation(self):
         obj = lldb.SBBreakpointLocation()
         if self.TraceOn():
@@ -69,7 +66,6 @@
         sb_breakpointlocation.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBBreakpointName(self):
         obj = lldb.SBBreakpointName()
         if self.TraceOn():
@@ -80,7 +76,6 @@
         sb_breakpointname.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBBroadcaster(self):
         obj = lldb.SBBroadcaster()
         if self.TraceOn():
@@ -91,7 +86,6 @@
         sb_broadcaster.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBCommandReturnObject(self):
         """SBCommandReturnObject object is valid after default construction."""
         obj = lldb.SBCommandReturnObject()
@@ -100,7 +94,6 @@
         self.assertTrue(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBCommunication(self):
         obj = lldb.SBCommunication()
         if self.TraceOn():
@@ -111,7 +104,6 @@
         sb_communication.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBCompileUnit(self):
         obj = lldb.SBCompileUnit()
         if self.TraceOn():
@@ -122,7 +114,6 @@
         sb_compileunit.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBDebugger(self):
         obj = lldb.SBDebugger()
         if self.TraceOn():
@@ -133,7 +124,6 @@
         sb_debugger.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     # darwin: This test passes with swig 3.0.2, fails w/3.0.5 other tests fail
     # with 2.0.12 http://llvm.org/pr23488
     def test_SBError(self):
@@ -146,7 +136,6 @@
         sb_error.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBEvent(self):
         obj = lldb.SBEvent()
         # This is just to test that typemap, as defined in lldb.swig, works.
@@ -171,7 +160,6 @@
         sb_filespec.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBFrame(self):
         obj = lldb.SBFrame()
         if self.TraceOn():
@@ -182,7 +170,6 @@
         sb_frame.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBFunction(self):
         obj = lldb.SBFunction()
         if self.TraceOn():
@@ -193,7 +180,6 @@
         sb_function.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBFile(self):
         sbf = lldb.SBFile()
         self.assertFalse(sbf.IsValid())
@@ -207,7 +193,6 @@
         self.assertTrue(e.Fail())
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBInstruction(self):
         obj = lldb.SBInstruction()
         if self.TraceOn():
@@ -218,7 +203,6 @@
         sb_instruction.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBInstructionList(self):
         obj = lldb.SBInstructionList()
         if self.TraceOn():
@@ -229,7 +213,6 @@
         sb_instructionlist.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBLineEntry(self):
         obj = lldb.SBLineEntry()
         if self.TraceOn():
@@ -240,7 +223,6 @@
         sb_lineentry.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBListener(self):
         obj = lldb.SBListener()
         if self.TraceOn():
@@ -251,7 +233,6 @@
         sb_listener.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     # Py3 asserts due to a bug in SWIG.  Trying to upstream a patch to fix
     # this in 3.0.8
     @skipIf(py_version=['>=', (3, 0)], swig_version=['<', (3, 0, 8)])
@@ -265,7 +246,6 @@
         sb_module.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBProcess(self):
         obj = lldb.SBProcess()
         if self.TraceOn():
@@ -276,7 +256,6 @@
         sb_process.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBProcessInfo(self):
         obj = lldb.SBProcessInfo()
         if self.TraceOn():
@@ -287,7 +266,6 @@
         sb_process_info.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBSection(self):
         obj = lldb.SBSection()
         if self.TraceOn():
@@ -298,7 +276,6 @@
         sb_section.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBStream(self):
         """SBStream object is valid after default construction."""
         obj = lldb.SBStream()
@@ -307,7 +284,6 @@
         self.assertTrue(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBStringList(self):
         obj = lldb.SBStringList()
         if self.TraceOn():
@@ -318,7 +294,6 @@
         sb_stringlist.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBSymbol(self):
         obj = lldb.SBSymbol()
         if self.TraceOn():
@@ -329,7 +304,6 @@
         sb_symbol.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBSymbolContext(self):
         obj = lldb.SBSymbolContext()
         if self.TraceOn():
@@ -340,7 +314,6 @@
         sb_symbolcontext.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBSymbolContextList(self):
         """SBSymbolContextList object is valid after default construction."""
         obj = lldb.SBSymbolContextList()
@@ -349,7 +322,6 @@
         self.assertTrue(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBTarget(self):
         obj = lldb.SBTarget()
         if self.TraceOn():
@@ -360,7 +332,6 @@
         sb_target.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBThread(self):
         obj = lldb.SBThread()
         if self.TraceOn():
@@ -371,7 +342,6 @@
         sb_thread.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBType(self):
         try:
             obj = lldb.SBType()
@@ -390,7 +360,6 @@
         sb_type.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBTypeList(self):
         """SBTypeList object is valid after default construction."""
         obj = lldb.SBTypeList()
@@ -399,7 +368,6 @@
         self.assertTrue(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBValue(self):
         obj = lldb.SBValue()
         if self.TraceOn():
@@ -410,7 +378,6 @@
         sb_value.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBValueList(self):
         obj = lldb.SBValueList()
         if self.TraceOn():
@@ -421,7 +388,6 @@
         sb_valuelist.fuzz_obj(obj)
 
     @add_test_categories(['pyapi'])
-    @no_debug_info_test
     def test_SBWatchpoint(self):
         obj = lldb.SBWatchpoint()
         if self.TraceOn():
Index: lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
+++ lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
@@ -17,6 +17,7 @@
 class EventAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
@@ -11,6 +11,7 @@
 class SBFrameFindValueTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])
     def test_formatters_api(self):
Index: lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
@@ -12,6 +12,7 @@
 class SBFormattersAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
@@ -14,6 +14,7 @@
 class ProcessAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
+++ lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
@@ -13,6 +13,7 @@
 class ProcessIOTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setup_test(self):
         # Get the full path to our executable to be debugged.
Index: lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
@@ -13,6 +13,7 @@
 
     # test for rdar://problem/12481949
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
+++ lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
@@ -12,6 +12,7 @@
 class SBDataAPICase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
@@ -11,6 +11,7 @@
 class SBValuePersistTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24772")
Index: lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
@@ -13,6 +13,7 @@
 
 class SignalsAPITestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     @add_test_categories(['pyapi'])
     @skipIfWindows  # Windows doesn't have signals
Index: lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -15,6 +15,7 @@
 class ValueAsLinkedListTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
@@ -14,6 +14,7 @@
 class SetWatchpointAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -14,6 +14,7 @@
 class WatchpointIgnoreCountTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
@@ -15,6 +15,7 @@
 class WatchpointIteratorTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     # hardware watchpoints are not reported with a hardware index # on armv7 on ios devices
     def affected_by_radar_34564183(self):
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -14,6 +14,7 @@
 class WatchpointConditionAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -15,6 +15,7 @@
 class SetWatchlocationAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().
Index: lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -14,6 +14,7 @@
 class TargetWatchAddressAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
         # Call super's setUp().