[Lldb-commits] [lldb] [lldb][test] Run 244 more API tests with PDB debug info (PR #230116)

Charles Zablit via lldb-commits lldb-commits at lists.llvm.org
Mon Oct 12 04:15:41 PDT 2026


https://github.com/charles-zablit updated https://github.com/llvm/llvm-project/pull/230116

>From 6de4297a8dc02d74385ca19c8d768f7b71dcfb68 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit at apple.com>
Date: Mon, 28 Sep 2026 12:03:19 +0100
Subject: [PATCH 1/3] [lldb][test] Run 244 more API tests with PDB debug info

---
 lldb/test/API/attach/TestWindowsAttachBreakpoint.py        | 2 ++
 .../breakpoint/location-dot/TestBreakpointLocationDot.py   | 2 ++
 .../expression/anonymous-struct/TestCallUserAnonTypedef.py | 2 ++
 .../expression/bitfield_enums/TestBitfieldEnums.py         | 2 ++
 .../expression/call-function/TestCallStopAndContinue.py    | 2 ++
 .../call-function/TestCallUserDefinedFunction.py           | 2 ++
 .../TestCastIntToAnonymousEnum.py                          | 2 ++
 lldb/test/API/commands/expression/char/TestExprsChar.py    | 1 +
 .../TestImportDefinitionArrayType.py                       | 2 ++
 .../TestCompletionCrashIncompleteRecord.py                 | 2 +-
 .../TestCompletionInLambdaAndUnnamedClass.py               | 1 +
 .../expression/context-object/TestContextObject.py         | 2 ++
 .../TestDeletingImplicitCopyConstructor.py                 | 1 +
 .../expression/dollar-in-variable/TestDollarInVariable.py  | 2 ++
 .../expression/expr-in-syscall/TestExpressionInSyscall.py  | 2 ++
 lldb/test/API/commands/expression/fixits/TestFixIts.py     | 2 ++
 .../API/commands/expression/formatters/TestFormatters.py   | 2 ++
 .../TestImportBaseClassWhenClassHasDerivedMember.py        | 2 +-
 .../ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py  | 2 ++
 .../memory-allocation/TestMemoryAllocSettings.py           | 2 ++
 .../commands/expression/no-deadlock/TestExprDoesntBlock.py | 2 ++
 .../API/commands/expression/options/TestExprOptions.py     | 2 ++
 .../persistent_ptr_update/TestPersistentPtrUpdate.py       | 2 ++
 .../expression/persistent_result/TestPersistentResult.py   | 2 ++
 .../persistent_types/TestNestedPersistentTypes.py          | 2 ++
 .../expression/persistent_types/TestPersistentTypes.py     | 2 ++
 .../persistent_variables/TestPersistentVariables.py        | 2 ++
 lldb/test/API/commands/expression/pr52257/TestExprCrash.py | 2 ++
 .../API/commands/expression/radar_8638051/Test8638051.py   | 2 ++
 .../commands/expression/radar_9531204/TestPrintfAfterUp.py | 2 ++
 .../expression/radar_9673664/TestExprHelpExamples.py       | 2 ++
 .../TestRegressionAccessFunctionTemplateInRecord.py        | 2 +-
 .../static-initializers/TestStaticInitializers.py          | 2 ++
 lldb/test/API/commands/expression/test/TestExprs.py        | 2 ++
 lldb/test/API/commands/expression/test/TestExprs2.py       | 2 ++
 .../API/commands/expression/top-level/TestTopLevelExprs.py | 2 ++
 .../unicode-in-variable/TestUnicodeInVariable.py           | 2 +-
 .../expression/unwind_expression/TestUnwindExpression.py   | 1 +
 .../API/commands/frame/var-scope/TestFrameVariableScope.py | 2 +-
 .../frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py | 2 ++
 .../API/commands/frame/var/repeat/TestFrameVarRepeat.py    | 2 ++
 .../TestReverseContinueCommandNotSupported.py              | 2 ++
 lldb/test/API/commands/source/info/TestSourceInfo.py       | 2 +-
 lldb/test/API/commands/target/basic/TestTargetCommand.py   | 1 +
 .../target/modules/lookup/TestImageLookupPCExpression.py   | 2 ++
 lldb/test/API/commands/thread/select/TestThreadSelect.py   | 2 ++
 lldb/test/API/functionalities/alias/TestBtAliasRepeat.py   | 2 ++
 lldb/test/API/functionalities/alias/TestPAlias.py          | 2 ++
 .../TestBreakpointByFileColonLine.py                       | 2 ++
 .../breakpoint_command/TestRegexpBreakCommand.py           | 2 ++
 .../breakpoint_conditions/TestBreakpointConditions.py      | 2 ++
 .../breakpoint_locations/TestBreakpointLocations.py        | 2 ++
 .../breakpoint_on_overload/TestBreakOnOverload.py          | 2 ++
 .../breakpoint/breakpoint_options/TestBreakpointOptions.py | 2 ++
 .../TestBreakpointResetUponRun.py                          | 1 +
 .../breakpoint_set_restart/TestBreakpointSetRestart.py     | 1 +
 .../default_source_file/TestDefaultSourceFile.py           | 2 ++
 .../delayed_breakpoints/TestDelayedBreakpoint.py           | 2 ++
 .../TestBreakpointsWithNoTargets.py                        | 2 ++
 .../inlined_breakpoints/TestInlinedBreakpoints.py          | 2 ++
 .../same_cu_name/TestFileBreakpointsSameCUName.py          | 2 ++
 .../breakpoint/source_regexp/TestSourceRegexBreakpoints.py | 2 ++
 .../step_over_breakpoint/TestStepOverBreakpoint.py         | 2 ++
 .../TestThreadPlanUserBreakpoint.py                        | 2 ++
 .../update_condition/TestUpdateBreakpointCondition.py      | 2 ++
 .../conditional_break/TestConditionalBreak.py              | 2 ++
 .../bytecode-synthetic/TestBytecodeSynthetic.py            | 2 ++
 .../callback-matching/TestDataFormatterCallbackMatching.py | 2 ++
 .../custom-printf-summary/TestCustomSummaryLLVMFormat.py   | 2 ++
 .../data-formatter-advanced/TestDataFormatterAdv.py        | 2 ++
 .../data-formatter-caching/TestDataFormatterCaching.py     | 2 ++
 .../data-formatter-disabling/TestDataFormatterDisabling.py | 2 ++
 .../TestDataFormatterEnumFormat.py                         | 2 ++
 .../data-formatter-globals/TestDataFormatterGlobals.py     | 2 ++
 .../TestDataFormatterNamedSummaries.py                     | 2 ++
 .../TestPtrToArrayFormatting.py                            | 2 ++
 .../TestDataFormatterPythonSynth.py                        | 2 ++
 .../data-formatter-script/TestDataFormatterScript.py       | 2 ++
 .../TestDataFormatterSkipSummary.py                        | 2 ++
 .../TestDataFormatterSmartArray.py                         | 2 ++
 .../invalid-atomic/TestDataFormatterInvalidAtomic.py       | 2 ++
 .../generic/iterator/TestDataFormatterStdIterator.py       | 1 +
 .../generic/queue/TestDataFormatterStdQueue.py             | 1 +
 .../data-formatter-synth/TestDataFormatterSynth.py         | 2 ++
 .../data-formatter-synthtype/TestDataFormatterSynthType.py | 2 ++
 .../format-propagation/TestFormatPropagation.py            | 2 ++
 .../frameformat_smallstruct/TestFrameFormatSmallStruct.py  | 2 ++
 .../data-formatter/hexcaps/TestDataFormatterHexCaps.py     | 2 ++
 .../TestDataFormatterLanguageCategoryUpdates.py            | 2 ++
 .../data-formatter/parray/TestPrintArray.py                | 2 ++
 .../TestDataFormatterRefPtrRecursion.py                    | 2 ++
 .../root-reference-children/TestRootReferenceChildren.py   | 2 ++
 .../data-formatter/stringprinter/TestStringPrinter.py      | 2 ++
 .../summary-string-onfail/TestSummaryStringOnFail.py       | 2 ++
 .../TestSyntheticOneLineSummaries.py                       | 2 ++
 .../data-formatter/synthcapping/TestSyntheticCapping.py    | 2 ++
 .../synthetic_subscript/TestSyntheticSubscript.py          | 2 ++
 .../type-synth-wants-deref/TestTypeSynthRequiresDeref.py   | 2 ++
 .../type_summary_list_script/TestTypeSummaryListScript.py  | 2 ++
 .../user-format-vs-summary/TestUserFormatVsSummary.py      | 2 ++
 lldb/test/API/functionalities/dead-strip/TestDeadStrip.py  | 2 ++
 .../functionalities/find-line-entry/TestFindLineEntry.py   | 2 ++
 .../API/functionalities/float-display/TestFloatDisplay.py  | 2 +-
 .../inferior-crashing/TestInferiorCrashing.py              | 2 ++
 .../inferior-crashing/TestInferiorCrashingStep.py          | 2 ++
 .../recursive-inferior/TestRecursiveInferior.py            | 2 ++
 .../recursive-inferior/TestRecursiveInferiorStep.py        | 2 ++
 .../API/functionalities/jitloader_gdb/TestJITLoaderGDB.py  | 2 ++
 .../location-list-lookup/TestLocationListLookup.py         | 2 ++
 .../memory/big-read/TestMemoryReadMaximumSize.py           | 2 ++
 .../non-overlapping-index-variable-i/TestIndexVariable.py  | 2 ++
 .../pointer_num_children/TestPointerNumChildren.py         | 2 ++
 .../process_crash_info/TestProcessCrashInfo.py             | 2 ++
 .../process_save_core/TestProcessSaveCore.py               | 2 ++
 .../progress_reporting/TestProgressReporting.py            | 2 ++
 lldb/test/API/functionalities/rerun/TestRerun.py           | 2 ++
 .../step-avoids-no-debug/TestStepNoDebug.py                | 2 ++
 .../thread/break_after_join/TestBreakAfterJoin.py          | 2 ++
 .../thread/crash_during_step/TestCrashDuringStep.py        | 2 ++
 .../thread/exit_during_break/TestExitDuringBreak.py        | 2 ++
 .../test/API/functionalities/thread/jump/TestThreadJump.py | 2 ++
 .../API/functionalities/thread/state/TestThreadStates.py   | 2 ++
 .../API/functionalities/thread/step_until/TestStepUntil.py | 1 +
 .../functionalities/type_find_first/TestFindFirstType.py   | 2 ++
 .../functionalities/unwind/zeroth_frame/TestZerothFrame.py | 2 ++
 .../functionalities/valobj_errors/TestValueObjectErrors.py | 2 ++
 lldb/test/API/lang/c/anonymous/TestAnonymous.py            | 2 ++
 lldb/test/API/lang/c/array_types/TestArrayTypes.py         | 2 ++
 lldb/test/API/lang/c/forward/TestForwardDeclaration.py     | 1 +
 lldb/test/API/lang/c/fpeval/TestFPEval.py                  | 2 ++
 lldb/test/API/lang/c/function_types/TestFunctionTypes.py   | 2 ++
 lldb/test/API/lang/c/local_variables/TestLocalVariables.py | 2 ++
 lldb/test/API/lang/c/non-mangled/TestCNonMangled.py        | 2 ++
 .../API/lang/c/register_variables/TestRegisterVariables.py | 2 ++
 lldb/test/API/lang/c/shared_lib/TestSharedLib.py           | 2 ++
 lldb/test/API/lang/c/sizeof/TestCSizeof.py                 | 2 ++
 .../c/step_over_no_deadlock/TestStepOverDoesntBlock.py     | 2 ++
 lldb/test/API/lang/c/stepping/TestThreadStepping.py        | 2 ++
 lldb/test/API/lang/c/strings/TestCStrings.py               | 2 ++
 lldb/test/API/lang/c/unions/TestUnionMembers.py            | 2 ++
 lldb/test/API/lang/cpp/auto/TestCPPAuto.py                 | 2 ++
 lldb/test/API/lang/cpp/bool/TestCPPBool.py                 | 2 ++
 lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py | 2 ++
 lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py   | 2 ++
 .../lang/cpp/builtin_types/long_int/TestLongIntTypes.py    | 2 ++
 .../test/API/lang/cpp/call-function/TestCallCPPFunction.py | 2 ++
 .../test/API/lang/cpp/chained-calls/TestCppChainedCalls.py | 2 ++
 lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py         | 2 ++
 lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py           | 2 ++
 lldb/test/API/lang/cpp/class_types/TestClassTypes.py       | 2 ++
 .../API/lang/cpp/class_types/TestClassTypesDisassembly.py  | 2 ++
 lldb/test/API/lang/cpp/constructors/TestCppConstructors.py | 2 ++
 lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py   | 1 +
 .../const_method/TestExprInConstMethod.py                  | 2 ++
 .../cv_qualified_objects/TestExprOnCVQualifiedObjects.py   | 2 ++
 .../non_const_method/TestExprInNonConstMethod.py           | 2 ++
 .../template_const_method/TestExprInTemplateConstMethod.py | 2 ++
 .../TestExprInTemplateNonConstMethod.py                    | 2 ++
 lldb/test/API/lang/cpp/fixits/TestCppFixIts.py             | 2 ++
 .../TestCppForwardDeclaredTemplateSpecialization.py        | 2 ++
 lldb/test/API/lang/cpp/fpnan/TestFPNaN.py                  | 2 ++
 .../TestFrameVariableAnonymousUnions.py                    | 2 ++
 .../TestFrameVarDepthAndElemCount.py                       | 2 ++
 .../TestFunctionCallFromObjectFile.py                      | 2 ++
 .../cpp/function-qualifiers/TestCppFunctionQualifiers.py   | 2 ++
 .../lang/cpp/global_operators/TestCppGlobalOperators.py    | 2 ++
 .../TestCppIncompatibleClassTemplates.py                   | 2 ++
 .../cpp/incomplete-stl-types/TestStlIncompleteTypes.py     | 2 ++
 .../lang/cpp/incomplete-types/TestCppIncompleteTypes.py    | 2 ++
 .../members/TestCppIncompleteTypeMembers.py                | 2 ++
 lldb/test/API/lang/cpp/inlines/TestInlines.py              | 2 ++
 lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py         | 7 ++++++-
 .../TestMembersAndLocalsWithSameName.py                    | 2 ++
 lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py    | 1 +
 .../lang/cpp/namespace_conflicts/TestNamespaceConflicts.py | 7 ++++++-
 .../TestNestedClassWithParentInAnotherCU.py                | 2 ++
 .../API/lang/cpp/no_unique_address/TestNoUniqueAddress.py  | 2 ++
 .../API/lang/cpp/operator-overload/TestOperatorOverload.py | 2 ++
 .../API/lang/cpp/rvalue-references/TestRvalueReferences.py | 2 ++
 lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py             | 2 ++
 .../API/lang/cpp/static_methods/TestCPPStaticMethods.py    | 2 ++
 lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py | 1 +
 lldb/test/API/lang/cpp/template/TestTemplateArgs.py        | 1 +
 lldb/test/API/lang/cpp/thunk/TestThunk.py                  | 2 ++
 lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py    | 2 ++
 .../type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py | 2 ++
 .../type_lookup_duplicate/TestCppTypeLookupDuplicate.py    | 2 ++
 .../lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py | 2 ++
 .../API/lang/cpp/unicode-literals/TestUnicodeLiterals.py   | 2 ++
 lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py     | 2 ++
 lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py   | 1 +
 .../lang/cpp/virtual-functions/TestCppVirtualFunctions.py  | 2 ++
 .../API/lang/cpp/virtual-overload/TestVirtualOverload.py   | 2 +-
 lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py            | 2 ++
 lldb/test/API/python_api/frame/TestFrames.py               | 2 ++
 lldb/test/API/python_api/frame_list/TestSBFrameList.py     | 2 ++
 .../python_api/interpreter/TestCommandOverrideCallback.py  | 2 ++
 lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py  | 2 ++
 lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py | 2 ++
 .../API/python_api/lldbutil/iter/TestRegistersIterator.py  | 2 ++
 .../python_api/lldbutil/process/TestPrintStackTraces.py    | 2 ++
 .../API/python_api/module_section/TestModuleAndSection.py  | 1 +
 lldb/test/API/python_api/process/TestProcessAPI.py         | 2 ++
 .../python_api/sbtype_basic_type/TestSBTypeBasicType.py    | 2 ++
 .../sbvalue_const_addrof/TestSBValueConstAddrOf.py         | 2 +-
 .../symbol-context/two-files/TestSymbolContextTwoFiles.py  | 2 ++
 lldb/test/API/python_api/thread/TestThreadAPI.py           | 1 +
 .../unified_section_list/TestModuleUnifiedSectionList.py   | 1 +
 lldb/test/API/python_api/value/TestValueAPI.py             | 1 +
 .../addr_of_void_star/TestValueAPIAddressOfVoidStar.py     | 2 ++
 .../python_api/value/change_values/TestChangeValueAPI.py   | 1 +
 .../python_api/value/empty_class/TestValueAPIEmptyClass.py | 2 ++
 .../value/get_expr_path/TestValueAPIGetExpressionPath.py   | 2 ++
 .../API/python_api/value_var_update/TestValueVarUpdate.py  | 1 +
 lldb/test/API/sample_test/TestSampleInlineTest.py          | 2 +-
 .../hidden_frame_markers/TestHiddenFrameMarkers.py         | 2 ++
 lldb/test/API/types/TestCharType.py                        | 2 ++
 lldb/test/API/types/TestCharTypeExpr.py                    | 2 ++
 lldb/test/API/types/TestDoubleTypes.py                     | 2 ++
 lldb/test/API/types/TestDoubleTypesExpr.py                 | 2 ++
 lldb/test/API/types/TestFloatTypes.py                      | 2 ++
 lldb/test/API/types/TestFloatTypesExpr.py                  | 2 ++
 lldb/test/API/types/TestIntegerType.py                     | 2 ++
 lldb/test/API/types/TestIntegerTypeExpr.py                 | 2 ++
 lldb/test/API/types/TestLongTypes.py                       | 2 ++
 lldb/test/API/types/TestLongTypesExpr.py                   | 2 ++
 lldb/test/API/types/TestRecursiveTypes.py                  | 1 +
 lldb/test/API/types/TestShortType.py                       | 2 ++
 lldb/test/API/types/TestShortTypeExpr.py                   | 2 ++
 lldb/test/API/windows/launch/missing-dll/TestMissingDll.py | 2 ++
 lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py | 1 +
 lldb/test/API/windows/thread/TestThreadName.py             | 2 ++
 232 files changed, 438 insertions(+), 12 deletions(-)

diff --git a/lldb/test/API/attach/TestWindowsAttachBreakpoint.py b/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
index 83bc28e5f40c0..4cbd67802b41f 100644
--- a/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
+++ b/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
@@ -13,6 +13,8 @@
 
 
 class WindowsAttachLoaderBreakpointTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def create_suspended_process(self, exe):
         """Create ``exe`` suspended and return its (pid, hProcess, hThread).
 
diff --git a/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py b/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
index f1714753168f4..b3d4e45c59b00 100644
--- a/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
+++ b/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
@@ -4,6 +4,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_disable_enable(self):
         self.build()
         _, _, thread, bp = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
index 76735fe62d5cd..6c5b389c27028 100644
--- a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
+++ b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
@@ -15,6 +15,8 @@
 
 @requireExpressionEvaluation
 class TestExprLookupAnonStructTypedef(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test typedeffed untagged struct arguments for function call expressions"""
         self.build_and_run()
diff --git a/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py b/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
index 05db4075870b8..5877e26dc9ea9 100644
--- a/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
+++ b/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
@@ -10,6 +10,8 @@
 
 
 class TestBitfieldEnum(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     # Prior to clang-19, clang's DWARF v2 is missing missing DW_AT_type which
     # causes unsigned_max to appear as -1 instead of the "max" enumerator, whose
     # value is 3. From 19 onward, DW_AT_type is added as long as strict DWARF
diff --git a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
index 0034c4d948799..13007cac0f201 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
@@ -10,6 +10,8 @@
 
 @requireExpressionEvaluation
 class ExprCommandCallStopContinueTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
index 0172c120065e9..c0b6884734ad0 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
@@ -15,6 +15,8 @@
 
 @requireExpressionEvaluation
 class ExprCommandCallUserDefinedFunction(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test return values of user defined function calls."""
         self.build()
diff --git a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
index 923f021d53399..a9f2e393c37e1 100644
--- a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
+++ b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
@@ -11,6 +11,8 @@
 
 
 class TestCastIntToAnonymousEnum(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_cast_int_to_anonymous_enum(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/char/TestExprsChar.py b/lldb/test/API/commands/expression/char/TestExprsChar.py
index 63acbee0bf3c8..495b1eb4073c1 100644
--- a/lldb/test/API/commands/expression/char/TestExprsChar.py
+++ b/lldb/test/API/commands/expression/char/TestExprsChar.py
@@ -5,6 +5,7 @@
 
 
 class ExprCharTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, dictionary=None):
diff --git a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
index 15790bc52c159..25aacbb02eb31 100644
--- a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
+++ b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
@@ -5,6 +5,8 @@
 
 
 class TestImportDefinitionArrayType(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py b/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
index f08c0dcbda983..ba2fcc78aea3b 100644
--- a/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
+++ b/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
index 0e3bfc2733a56..41105251318dc 100644
--- a/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
+++ b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
@@ -4,4 +4,5 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
+    test_with_pdb_debug_info=True,
 )
diff --git a/lldb/test/API/commands/expression/context-object/TestContextObject.py b/lldb/test/API/commands/expression/context-object/TestContextObject.py
index ebbb42418ae19..f82fbdf3f7149 100644
--- a/lldb/test/API/commands/expression/context-object/TestContextObject.py
+++ b/lldb/test/API/commands/expression/context-object/TestContextObject.py
@@ -10,6 +10,8 @@
 
 @requireExpressionEvaluation
 class ContextObjectTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_context_object(self):
         """Tests expression evaluation in context of an object."""
         self.build()
diff --git a/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
index ce74dd27cc179..c62aede8ad304 100644
--- a/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
+++ b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
@@ -7,4 +7,5 @@
     [
         decorators.expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc"),
     ],
+    test_with_pdb_debug_info=True,
 )
diff --git a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
index 4e3be3f49de32..2d8c1df5f4efb 100644
--- a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
+++ b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
index c22987550efa8..0e4f669b9c711 100644
--- a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
@@ -7,6 +7,8 @@
 
 
 class ExprSyscallTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureNetBSD
     def test_setpgid(self):
         self.build()
diff --git a/lldb/test/API/commands/expression/fixits/TestFixIts.py b/lldb/test/API/commands/expression/fixits/TestFixIts.py
index bfe11f6c6fcb9..c1c0e0838f41a 100644
--- a/lldb/test/API/commands/expression/fixits/TestFixIts.py
+++ b/lldb/test/API/commands/expression/fixits/TestFixIts.py
@@ -9,6 +9,8 @@
 
 
 class ExprCommandWithFixits(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_dummy_target(self):
         """Test calling expressions in the dummy target with errors that can be fixed by the FixIts."""
 
diff --git a/lldb/test/API/commands/expression/formatters/TestFormatters.py b/lldb/test/API/commands/expression/formatters/TestFormatters.py
index fa48027bb64bf..6d2981de4545f 100644
--- a/lldb/test/API/commands/expression/formatters/TestFormatters.py
+++ b/lldb/test/API/commands/expression/formatters/TestFormatters.py
@@ -11,6 +11,8 @@
 
 @requireExpressionEvaluation
 class ExprFormattersTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py b/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
index c8308c16011e0..0cdd46e00c068 100644
--- a/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
+++ b/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
index 076e11603ed2a..49bb01a646161 100644
--- a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
+++ b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
@@ -9,6 +9,8 @@
 
 
 class IRInterpreterPHINodesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_phi_node_support(self):
         """Test support for PHI nodes in the IR interpreter."""
 
diff --git a/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py b/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
index e7fae4d4066f6..fcaf385ba9a96 100644
--- a/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
+++ b/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
@@ -9,6 +9,8 @@
 
 
 class TestMemoryAllocSettings(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test changing settings for expression memory allocation."""
         self.build()
diff --git a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
index aae82c72d986a..d1629676d94a7 100644
--- a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
@@ -10,6 +10,8 @@
 
 @requireThreadSupport
 class ExprDoesntDeadlockTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @add_test_categories(["basic_process"])
     def test_with_run_command(self):
         """Test that expr will time out and allow other threads to run if it blocks."""
diff --git a/lldb/test/API/commands/expression/options/TestExprOptions.py b/lldb/test/API/commands/expression/options/TestExprOptions.py
index 02f844b34cc2b..7dfb069be6199 100644
--- a/lldb/test/API/commands/expression/options/TestExprOptions.py
+++ b/lldb/test/API/commands/expression/options/TestExprOptions.py
@@ -14,6 +14,8 @@
 
 
 class ExprOptionsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
index 8b722b80bddb8..c1dfc8810cf3d 100644
--- a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -9,6 +9,8 @@
 
 
 class PersistentPtrUpdateTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that we can have persistent pointer variables"""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py b/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
index 911b8f605939b..396392635452c 100644
--- a/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
+++ b/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
@@ -9,6 +9,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
index 0c81d202f053f..065ca6208fc2f 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
@@ -11,6 +11,8 @@
 
 @requireExpressionEvaluation
 class NestedPersistentTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_persistent_types(self):
         """Test that nested persistent types work."""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
index 473937ab6e412..dd5894562684f 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
@@ -11,6 +11,8 @@
 
 @requireExpressionEvaluation
 class PersistenttypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_persistent_types(self):
         """Test that lldb persistent types works correctly."""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
index d0d9358589a71..3aae7f05e5ef1 100644
--- a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
@@ -8,6 +8,8 @@
 
 
 class PersistentVariablesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_persistent_variables(self):
         """Test that lldb persistent variables works correctly."""
         self.build()
diff --git a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
index de8c7f7b58d4c..687cbdfa2de43 100644
--- a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
+++ b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
@@ -9,6 +9,8 @@
 
 
 class ExprCrashTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_pr52257(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
index 78dbd241cd512..6c4b6110143d5 100644
--- a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
+++ b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
@@ -8,6 +8,8 @@
 
 
 class Radar8638051TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_expr_commands(self):
         """The following expression commands should not crash."""
         self.build()
diff --git a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
index f869e4736e01b..d71de81438a68 100644
--- a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
@@ -11,6 +11,8 @@
 
 @requireExpressionEvaluation
 class Radar9531204TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     # rdar://problem/9531204
     def test_expr_commands(self):
         """The evaluating printf(...) after break stop and then up a stack frame."""
diff --git a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
index ada647b59eaf7..da2d7b57fd88d 100644
--- a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
@@ -11,6 +11,8 @@
 
 @requireExpressionEvaluation
 class Radar9673644TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py b/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
index f08c0dcbda983..ba2fcc78aea3b 100644
--- a/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
+++ b/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
index c734033bd6c02..5eb02a8b1d48a 100644
--- a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
+++ b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
@@ -5,6 +5,8 @@
 
 
 class StaticInitializers(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(
         archs="aarch64",
         oslist=["freebsd"],
diff --git a/lldb/test/API/commands/expression/test/TestExprs.py b/lldb/test/API/commands/expression/test/TestExprs.py
index 65e1e7b9b3e2a..b0016e71daf46 100644
--- a/lldb/test/API/commands/expression/test/TestExprs.py
+++ b/lldb/test/API/commands/expression/test/TestExprs.py
@@ -21,6 +21,8 @@
 
 @requireExpressionEvaluation
 class BasicExprCommandsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/test/TestExprs2.py b/lldb/test/API/commands/expression/test/TestExprs2.py
index 44a6b374199ee..be6c071667e54 100644
--- a/lldb/test/API/commands/expression/test/TestExprs2.py
+++ b/lldb/test/API/commands/expression/test/TestExprs2.py
@@ -10,6 +10,8 @@
 
 
 class ExprCommands2TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
index bbaa6b8137d1e..900ac69b37c3d 100644
--- a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
+++ b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
@@ -10,6 +10,8 @@
 
 
 class TopLevelExpressionsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py b/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
index 03424658f3ed3..ef9a9b339d4ff 100644
--- a/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
+++ b/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), None)
+lldbinline.MakeInlineTest(__file__, globals(), None, test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
index 05c3e33499737..fde587b0a78e6 100644
--- a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
+++ b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
@@ -10,6 +10,7 @@
 
 @requireExpressionEvaluation
 class UnwindFromExpressionTest(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     main_spec = lldb.SBFileSpec("main.cpp", False)
 
     def build_and_run_to_bkpt(self):
diff --git a/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py b/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
index f08c0dcbda983..ba2fcc78aea3b 100644
--- a/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
+++ b/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py b/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
index 8db5c545693c4..1f6789420eb30 100644
--- a/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
+++ b/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_cpp_this(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py b/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
index 97ca35cb47416..24b4d20d42083 100644
--- a/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
+++ b/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
@@ -4,6 +4,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_explicit_depth(self):
         """Test that repeating 'frame variable' increments --depth."""
         self.build()
diff --git a/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py b/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
index 112add6dddb61..8e882376eb883 100644
--- a/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
+++ b/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
@@ -11,6 +11,8 @@
 
 
 class TestReverseContinueCommandNotSupported(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_reverse_continue_not_supported(self):
         target = self.connect()
 
diff --git a/lldb/test/API/commands/source/info/TestSourceInfo.py b/lldb/test/API/commands/source/info/TestSourceInfo.py
index c8308c16011e0..0cdd46e00c068 100644
--- a/lldb/test/API/commands/source/info/TestSourceInfo.py
+++ b/lldb/test/API/commands/source/info/TestSourceInfo.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/commands/target/basic/TestTargetCommand.py b/lldb/test/API/commands/target/basic/TestTargetCommand.py
index fcb50effb77fe..30c52e15c2c73 100644
--- a/lldb/test/API/commands/target/basic/TestTargetCommand.py
+++ b/lldb/test/API/commands/target/basic/TestTargetCommand.py
@@ -13,6 +13,7 @@
 
 
 class targetCommandTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py b/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
index 9872e057cbbfb..dd5b07abb3cf4 100644
--- a/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
+++ b/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
@@ -9,6 +9,8 @@
 
 
 class TestImageLookupPCInC(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_sample_rename_this(self):
         """There can be many tests in a test case - describe this test here."""
         self.build()
diff --git a/lldb/test/API/commands/thread/select/TestThreadSelect.py b/lldb/test/API/commands/thread/select/TestThreadSelect.py
index 6d95bac1bdb60..3b8214489681a 100644
--- a/lldb/test/API/commands/thread/select/TestThreadSelect.py
+++ b/lldb/test/API/commands/thread/select/TestThreadSelect.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_invalid_arg(self):
         self.build()
 
diff --git a/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py b/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
index 60c0dd0a233bf..7094ee45f50d3 100644
--- a/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
+++ b/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
@@ -4,6 +4,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/alias/TestPAlias.py b/lldb/test/API/functionalities/alias/TestPAlias.py
index e1f00b91e0149..278e06d2c77f3 100644
--- a/lldb/test/API/functionalities/alias/TestPAlias.py
+++ b/lldb/test/API/functionalities/alias/TestPAlias.py
@@ -4,6 +4,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
index 7b4e553e7cee7..bdcb13e9da903 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
@@ -10,6 +10,8 @@
 
 
 class BreakpointByLineAndColumnTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def testBreakpointSpecWithLine(self):
         self.build()
         target = self.createTestTarget()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index 930d497032171..bd0e40d556cd1 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
@@ -10,6 +10,8 @@
 
 
 class RegexpBreakCommandTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_set_version(self):
         """Test _regexp-break command."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 7bee800692dcf..cfc687f6e98d3 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -10,6 +10,8 @@
 # Flaky on buildbot, https://github.com/llvm/llvm-project/issues/206141.
 @skipIf(oslist=["windows"], archs=["aarch64"])
 class BreakpointConditionsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_breakpoint_condition_and_run_command(self):
         """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 65ca990365654..38b1acea1ef88 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -10,6 +10,8 @@
 
 
 class BreakpointLocationsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_enable(self):
         """Test breakpoint enable/disable for a breakpoint ID with multiple locations."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
index 8bbac51a0c975..87380278dae0a 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
@@ -10,6 +10,8 @@
 
 
 class TestBreakpointOnOverload(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def check_breakpoint(self, name):
         bkpt = self.target.BreakpointCreateByName(name)
         self.assertEqual(bkpt.num_locations, 1, "Got one location")
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index d262b627195bc..db96c5b47069d 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -9,6 +9,8 @@
 
 
 class BreakpointOptionsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test breakpoint command for different options."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py b/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
index 8c4965e9576f9..641e80feb59be 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
@@ -8,6 +8,7 @@
 
 
 class HitcountResetUponRun(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     BREAKPOINT_TEXT = "Set a breakpoint here"
 
     def check_stopped_at_breakpoint_and_hit_once(self, thread, breakpoint):
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
index dac6a8f06c221..2acc5174e46c3 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
@@ -8,6 +8,7 @@
 
 
 class BreakpointSetRestart(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     BREAKPOINT_TEXT = "Set a breakpoint here"
 
     @skipIfNetBSD
diff --git a/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py b/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
index bf9349d570921..2c308dc6f3ea2 100644
--- a/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
+++ b/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
@@ -5,6 +5,8 @@
 
 
 class DefaultSourceFileTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_default_source_file_is_entry_point(self):
         """The default file for a line breakpoint is main's file, not Foo::main's."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py b/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
index fb9a764b5170e..9086cf4b22652 100644
--- a/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
@@ -8,6 +8,8 @@
 @skipIfWindowsAndNoLLDBServer
 @requireNotWasm("iwasm gdb stub lacks the needed packets")
 class TestDelayedBreakpoint(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         self.runCmd("settings set target.process.use-delayed-breakpoints true")
diff --git a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index 87c8949b9c399..be3fd2f8a35c7 100644
--- a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
@@ -9,6 +9,8 @@
 
 
 class BreakpointInDummyTarget(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test breakpoint set before we have a target."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index ea3e0b75b4de1..087a383188be1 100644
--- a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -12,6 +12,8 @@
 class InlinedBreakpointsTestCase(TestBase):
     """Bug fixed: rdar://problem/8464339"""
 
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py b/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
index dc10d407d7230..7c9ddecd35026 100644
--- a/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
+++ b/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
@@ -11,6 +11,8 @@
 
 
 class TestBreakpointSameCU(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_breakpoint_same_cu(self):
         self.build()
         target = self.createTestTarget()
diff --git a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
index 00bcde39bdfe1..ffe3e1dc712ce 100644
--- a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
@@ -11,6 +11,8 @@
 
 
 class TestSourceRegexBreakpoints(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_location(self):
         self.build()
         self.source_regex_locations()
diff --git a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
index 1315288b35c55..9b47b1527e11c 100644
--- a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
@@ -12,6 +12,8 @@
 
 
 class StepOverBreakpointsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
 
diff --git a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
index 1cae52a0f74b1..4f7c01bce8a4b 100644
--- a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
@@ -16,6 +16,8 @@
 
 
 class ThreadPlanUserBreakpointsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
 
diff --git a/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py b/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
index ae929fc4d9f5a..b67f76dc166ef 100644
--- a/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
+++ b/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
@@ -14,6 +14,8 @@
 
 
 class UpdateBreakpointConditionTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.source = "main.c"
diff --git a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
index f023325d12b9c..6df93bb8df078 100644
--- a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
@@ -14,6 +14,8 @@
 
 
 class ConditionalBreakTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @add_test_categories(["pyapi"])
     def test_with_python(self):
         """Exercise some thread and frame APIs to break if c() is called by a()."""
diff --git a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
index 21228c61e1427..de79f92794168 100644
--- a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_synthetic(self):
         self.build()
         if self.TraceOn():
diff --git a/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py b/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
index 4c55fa879c677..f570296f8c18a 100644
--- a/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
+++ b/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
@@ -9,6 +9,8 @@
 
 
 class PythonSynthDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py b/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
index d6906a49463ba..ed3d3827cf412 100644
--- a/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
+++ b/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
@@ -4,6 +4,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_raw_bytes(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index 516582de024c1..30b70de93cfa2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
@@ -10,6 +10,8 @@
 
 
 class AdvDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
index c622aba4f6bc0..a8baf2ac60816 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
@@ -5,6 +5,8 @@
 
 
 class TestDataFormatterCaching(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """
         Test that hardcoded summary formatter matches aren't improperly cached.
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index e6aeef2bedff2..4fa3d16e6df48 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
@@ -10,6 +10,8 @@
 
 
 class DataFormatterDisablingTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index d2d596eb838db..cbccc92021868 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
@@ -9,6 +9,8 @@
 
 
 class EnumFormatTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index 5ff6fd90683b6..e8b38b7502f2f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
@@ -10,6 +10,8 @@
 
 
 class GlobalsDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index 54fb44b10feb7..f50c8d990d7a0 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
@@ -9,6 +9,8 @@
 
 
 class NamedSummariesDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 29085db3a4fce..020127c7a66ec 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
@@ -9,6 +9,8 @@
 
 
 class PtrToArrayDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test that LLDB handles the clang typeclass Paren correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index 7c8133482db92..2025b3b551169 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
@@ -9,6 +9,8 @@
 
 
 class PythonSynthDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
index 50076b7f2f8c1..210592d314c73 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
@@ -9,6 +9,8 @@
 
 
 class ScriptDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index 91b249b677c73..e185f34be7cf6 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
@@ -10,6 +10,8 @@
 
 
 class SkipSummaryDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index 10592bc9fb329..806e33b6cba6a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
@@ -10,6 +10,8 @@
 
 
 class SmartArrayDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
index 76b8e7b40f440..8694349a3717d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
@@ -8,6 +8,8 @@
 
 
 class InvalidAtomicDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
index 56874a9dda500..f284c946f8fa2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
@@ -9,6 +9,7 @@
 
 
 class StdIteratorDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
index 166ed83220d2b..b8d4712ea2d99 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
@@ -9,6 +9,7 @@
 
 
 class TestDataFormatterStdQueue(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index 2c475d2626a1f..ec2db8303c76b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
@@ -9,6 +9,8 @@
 
 
 class SynthDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
index 0aeeb7db3e270..d6f2f917e92ea 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
@@ -10,6 +10,8 @@
 
 
 class DataFormatterSynthTypeTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index a13ca0eae8315..f1cf7f26ffc9a 100644
--- a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
@@ -9,6 +9,8 @@
 
 
 class FormatPropagationTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index 265880d683079..b13b361218deb 100644
--- a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
@@ -9,6 +9,8 @@
 
 
 class FrameFormatSmallStructTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index c8d0b093a0203..e0dde6c2ebf47 100644
--- a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -9,6 +9,8 @@
 
 
 class DataFormatterHexCapsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
index 79260f69634d3..155408c1b8a4c 100644
--- a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
+++ b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
@@ -9,6 +9,8 @@
 
 
 class LanguageCategoryUpdatesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
index d5c933e3add53..7890a265c4b78 100644
--- a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
+++ b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
@@ -10,6 +10,8 @@
 
 
 class PrintArrayTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_print_array(self):
         """Test that expr -Z works"""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index cd839752a7a42..9bedd775cdc52 100644
--- a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
@@ -9,6 +9,8 @@
 
 
 class DataFormatterRefPtrRecursionTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py b/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
index 7c366445b1c6e..7b6ff6e728a69 100644
--- a/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
+++ b/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py b/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
index 2a91b455b3c2a..4fdffea9d9a8f 100644
--- a/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
+++ b/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
@@ -4,6 +4,8 @@
 
 
 class TestStringPrinter(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
index 5096283908622..bf6f6455c8c1e 100644
--- a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
+++ b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
@@ -9,6 +9,8 @@
 
 
 class SummaryStringOnFailDataFormatterTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py b/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
index 4cada6efcca85..689fa13f1d8ce 100644
--- a/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
+++ b/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
@@ -5,6 +5,8 @@
 
 
 class SyntheticOneLineSummariesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that the presence of a synthetic child provider doesn't prevent one-line-summaries."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index e7711a8952e67..e3bf36e3ecd90 100644
--- a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -10,6 +10,8 @@
 
 
 class SyntheticCappingTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py b/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
index be34b0f1f72d8..7dd3479869f71 100644
--- a/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
+++ b/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         _, process, _, _ = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py b/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
index ca56432841284..c76b31df8ce54 100644
--- a/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
+++ b/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
@@ -9,6 +9,8 @@
 
 
 class TypeSynthRequiresDerefTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.addTearDownHook(lambda: self.runCmd("type synth clear", check=False))
diff --git a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
index bfc07d26ddc5a..5598bf6795f4b 100644
--- a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
+++ b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
@@ -10,6 +10,8 @@
 
 
 class TypeSummaryListScriptTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_typesummarylist_script(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index 0941465c87d0d..17296ab8e1acd 100644
--- a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
@@ -9,6 +9,8 @@
 
 
 class UserFormatVSSummaryTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
index ef3b00d75b599..8d9e00691e5d3 100644
--- a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
@@ -10,6 +10,8 @@
 
 
 class DeadStripTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test breakpoint works correctly with dead-code stripping."""
         self.build()
diff --git a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
index 3f1760e76dde2..608ccd8375c1e 100644
--- a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
+++ b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
@@ -8,6 +8,8 @@
 
 
 class FindLineEntry(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_compile_unit_find_line_entry_index(self):
         """Test the CompileUnit LineEntryIndex lookup API"""
         self.build()
diff --git a/lldb/test/API/functionalities/float-display/TestFloatDisplay.py b/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
index f08c0dcbda983..ba2fcc78aea3b 100644
--- a/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
+++ b/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
index dfd311c766349..ee779a9e1b0b8 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -10,6 +10,8 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingInferiorTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
index 248830c7ccac5..967b9d3916c3e 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
@@ -10,6 +10,8 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingInferiorStepTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 89f605510918b..8e1b964f981db 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -10,6 +10,8 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingRecursiveInferiorTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_recursive_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
index 99d03c257801d..9dceb4bf93cb7 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
@@ -10,6 +10,8 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingRecursiveInferiorStepTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_recursive_inferior_crashing_step(self):
         """Test that stepping after a crash behaves correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index 98c0b149003df..786ab45f0ce4d 100644
--- a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
@@ -10,6 +10,8 @@
 
 
 class JITLoaderGDBTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipTestIfFn(
         lambda: "Skipped because the test crashes the test runner",
         bugnumber="llvm.org/pr24702",
diff --git a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
index 3a58296b70cd2..63e981016a1cb 100644
--- a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
+++ b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
@@ -7,6 +7,8 @@
 
 
 class LocationListLookupTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def launch(self) -> lldb.SBProcess:
         exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
diff --git a/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py b/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
index 1bc227dfce9be..5f3cb7a06fef9 100644
--- a/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
+++ b/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
@@ -9,6 +9,8 @@
 
 
 class TestMemoryReadMaximumSize(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_memory_read_max_setting(self):
         """Test the target.max-memory-read-size setting."""
         self.build()
diff --git a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index 4efd3b72b44c2..60c7f0da5c22a 100644
--- a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
@@ -8,6 +8,8 @@
 
 
 class NonOverlappingIndexVariableCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.source = "main.cpp"
diff --git a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
index 9d8c8b778827c..174748232e92e 100644
--- a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
+++ b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
@@ -9,6 +9,8 @@
 
 
 class TestPointerNumChilden(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_pointer_num_children(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
index acd299f4e179b..d74d5720368c0 100644
--- a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
+++ b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
@@ -12,6 +12,8 @@
 
 
 class PlatformProcessCrashInfoTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.runCmd("settings set auto-confirm true")
diff --git a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
index d006c489b068d..5aa1e11cd921a 100644
--- a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
+++ b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
@@ -12,6 +12,8 @@
 
 
 class ProcessSaveCoreTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIfRemote
     @skipUnlessWindows
     def test_cannot_save_core_unless_process_stopped(self):
diff --git a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
index 583e187cb6d3a..eed15bdce8f86 100644
--- a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
@@ -9,6 +9,8 @@
 
 
 class TestProgressReporting(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.broadcaster = self.dbg.GetBroadcaster()
diff --git a/lldb/test/API/functionalities/rerun/TestRerun.py b/lldb/test/API/functionalities/rerun/TestRerun.py
index 0c74b71498244..de12819ef31a5 100644
--- a/lldb/test/API/functionalities/rerun/TestRerun.py
+++ b/lldb/test/API/functionalities/rerun/TestRerun.py
@@ -10,6 +10,8 @@
 
 
 class TestRerun(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         exe = self.getBuildArtifact("a.out")
diff --git a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index 2894dbcfd25d8..cf40cba4927b7 100644
--- a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
@@ -10,6 +10,8 @@
 
 
 class StepAvoidsNoDebugTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @add_test_categories(["pyapi"])
     @expectedFailureAll(
         archs=["aarch64"], oslist=["windows"], bugnumber="llvm.org/pr56292"
diff --git a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index 897ec8eae8cf5..e44e9957eb058 100644
--- a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
@@ -11,6 +11,8 @@
 
 @requireThreadSupport
 class BreakpointAfterJoinTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index e2abc64f51413..1d7e14c7a9b94 100644
--- a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
@@ -10,6 +10,8 @@
 
 
 class CrashDuringStepTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.breakpoint = line_number("main.cpp", "// Set breakpoint here")
diff --git a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index f9947abb65457..c9435d5d6c20c 100644
--- a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
@@ -11,6 +11,8 @@
 
 @requireThreadSupport
 class ExitDuringBreakpointTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
index 6ad2266a64c2f..3d6c4b1cf3c0b 100644
--- a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
@@ -11,6 +11,8 @@
 
 @skipIfWasm  # Wasm has no writable PC to jump
 class ThreadJumpTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.build()
diff --git a/lldb/test/API/functionalities/thread/state/TestThreadStates.py b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
index e46795debd502..5c164a5723466 100644
--- a/lldb/test/API/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
@@ -11,6 +11,8 @@
 
 
 class ThreadStateTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_state_after_breakpoint(self):
         """Test thread state after breakpoint."""
         self.build()
diff --git a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
index 5b3f6b449efbc..c856dc0671297 100644
--- a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
+++ b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
@@ -7,6 +7,7 @@
 
 
 class StepUntilTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py b/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
index b1c5659a324a4..57f603cd307fe 100644
--- a/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
+++ b/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
@@ -8,6 +8,8 @@
 
 
 class TypeFindFirstTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_find_first_type(self):
         """
         Test SBTarget::FindFirstType() and SBModule::FindFirstType() APIs.
diff --git a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
index d660844405e13..3e89c093dd416 100644
--- a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
+++ b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
@@ -28,6 +28,8 @@
 
 
 class ZerothFrame(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """
         Test that line information is recalculated properly for a frame when it moves
diff --git a/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py b/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
index 8a114005c493b..c1fb4b5568aa4 100644
--- a/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
+++ b/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
@@ -5,6 +5,8 @@
 
 
 class ValueObjectErrorsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that the error message for a missing type
         is visible when printing an object"""
diff --git a/lldb/test/API/lang/c/anonymous/TestAnonymous.py b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
index 5f3089983bb1b..fa4f1664b0a38 100644
--- a/lldb/test/API/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
@@ -8,6 +8,8 @@
 
 
 class AnonymousTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIf(
         compiler="icc",
         bugnumber="llvm.org/pr15036: LLDB generates an incorrect AST layout for an anonymous struct when DWARF is generated by ICC",
diff --git a/lldb/test/API/lang/c/array_types/TestArrayTypes.py b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
index fc234f5842508..5138c0ceb0e29 100644
--- a/lldb/test/API/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
@@ -8,6 +8,8 @@
 
 
 class ArrayTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
index 0cb8ac5056e29..02ea07335f935 100644
--- a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
@@ -8,6 +8,7 @@
 
 
 class ForwardDeclarationTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, dictionary=None):
diff --git a/lldb/test/API/lang/c/fpeval/TestFPEval.py b/lldb/test/API/lang/c/fpeval/TestFPEval.py
index 0a953d2d66bf2..da0487de869ce 100644
--- a/lldb/test/API/lang/c/fpeval/TestFPEval.py
+++ b/lldb/test/API/lang/c/fpeval/TestFPEval.py
@@ -8,6 +8,8 @@
 
 @requireExpressionEvaluation
 class FPEvalTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
index c3b91beed55f4..424854398667a 100644
--- a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
@@ -9,6 +9,8 @@
 
 @requireExpressionEvaluation
 class FunctionTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
index 930999834999a..57a419bcd1903 100644
--- a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
+++ b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
@@ -12,6 +12,8 @@
 
 
 class LocalVariablesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py b/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
index 6f7ef247b063a..149aa8aa8724e 100644
--- a/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
+++ b/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
@@ -3,6 +3,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_functions_having_dlang_mangling_prefix(self):
         """
         Ensure C functions with a '_D' prefix alone are not mistakenly treated
diff --git a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
index bcdd590e00d0a..62dca58985edd 100644
--- a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
@@ -13,6 +13,8 @@ def re_expr_equals(val_type, val):
 
 
 class RegisterVariableTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(compiler="clang", compiler_version=["<", "3.5"])
     @expectedFailureAll(
         compiler="gcc", compiler_version=[">=", "4.8.2"], archs=["i386"]
diff --git a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
index e9c979c1a2ec5..5e1c63fc22791 100644
--- a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
@@ -10,6 +10,8 @@
 
 @skipIfTargetDoesNotSupportSharedLibraries()
 class SharedLibTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def common_test_expr(self, preload_symbols):
         if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion():
             self.skipTest(
diff --git a/lldb/test/API/lang/c/sizeof/TestCSizeof.py b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
index 9b15c19f8dcf3..1e294356fc044 100644
--- a/lldb/test/API/lang/c/sizeof/TestCSizeof.py
+++ b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
index 2e0f8dcc041c2..d38a13002b1e2 100644
--- a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
+++ b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
@@ -10,6 +10,8 @@
 
 @requireThreadSupport
 class StepOverDoesntDeadlockTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_step_over(self):
         """Test that when step over steps over a function it lets other threads run."""
         self.build()
diff --git a/lldb/test/API/lang/c/stepping/TestThreadStepping.py b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
index f577cb62e715e..64a936658ac1f 100644
--- a/lldb/test/API/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
@@ -9,6 +9,8 @@
 
 
 class ThreadSteppingTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/strings/TestCStrings.py b/lldb/test/API/lang/c/strings/TestCStrings.py
index 1198689c6b981..c6ea0d864e615 100644
--- a/lldb/test/API/lang/c/strings/TestCStrings.py
+++ b/lldb/test/API/lang/c/strings/TestCStrings.py
@@ -9,6 +9,8 @@
 
 @requireExpressionEvaluation
 class CStringsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Tests that C strings work as expected in expressions"""
         self.build()
diff --git a/lldb/test/API/lang/c/unions/TestUnionMembers.py b/lldb/test/API/lang/c/unions/TestUnionMembers.py
index 263f76a313ecf..2c8487b00a983 100644
--- a/lldb/test/API/lang/c/unions/TestUnionMembers.py
+++ b/lldb/test/API/lang/c/unions/TestUnionMembers.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
index c02341356e462..cb52c09d35436 100644
--- a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
+++ b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
@@ -9,6 +9,8 @@
 
 @requireExpressionEvaluation
 class CPPAutoTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test that auto types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/bool/TestCPPBool.py b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
index a92f1af565c14..a8cb25047ef4f 100644
--- a/lldb/test/API/lang/cpp/bool/TestCPPBool.py
+++ b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
@@ -7,6 +7,8 @@
 
 
 class CPPBoolTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test that bool types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py b/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
index d2c87df456b4e..d67150fa44b0d 100644
--- a/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py b/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
index 932dd17192163..df2755f430eeb 100644
--- a/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Check the types and values of all integer-typed variables."""
         self.build_and_run()
diff --git a/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py b/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
index 190fb54017ee4..419546601d20a 100644
--- a/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def _long_size(self):
         """Return sizeof(long) in bytes, read from the 'long_size' global."""
         long_size = self.target().FindFirstGlobalVariable("long_size")
diff --git a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
index 00a2735a40af2..455ca75893e9b 100644
--- a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
+++ b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
@@ -10,6 +10,8 @@
 
 @requireExpressionEvaluation
 class CallCPPFunctionTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number("main.cpp", "// breakpoint")
diff --git a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
index 7b81525e9b414..398cddb0b9c47 100644
--- a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
+++ b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCppChainedCalls(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
index 6edac71e06f52..b17acbbd1b105 100644
--- a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
@@ -11,6 +11,8 @@
 
 
 class Char1632TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
index c727ae9cf6ab6..d533c618a47c9 100644
--- a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
+++ b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
@@ -11,6 +11,8 @@
 
 
 class CxxChar8_tTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIfDarwin  # Chained Fixups
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
     def test_without_process(self):
diff --git a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
index b5d5dd2370781..b6dc9c5d9e675 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
@@ -9,6 +9,8 @@
 
 
 class ClassTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
index 2bc8f56bf99d1..19dfae07bddcd 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -10,6 +10,8 @@
 
 
 class IterateFrameAndDisassembleTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_and_run_command(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
index 8e178de97eea7..1a4baf8f9e465 100644
--- a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
+++ b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc")
     def test_constructors(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
index 50307c6f458ba..5c01926b352ef 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -9,6 +9,7 @@
 
 
 class CppValueCastTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @skipIf(bugnumber="llvm.org/PR36714")
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
index fc662f9cdf1f7..c0bf1df1438b1 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
index bfd5f7dba8e5f..41e9d56737299 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
index a4cdffb19e4cb..a81b9223b8e87 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
index c20fdd1d34ef9..08fe1e0a677be 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
index 5ce0740247286..56baa18e963b6 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py b/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
index 34b52f796da28..9ddffa92b1e8c 100644
--- a/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
+++ b/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
@@ -9,6 +9,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_fixit_with_dwim(self):
         """Confirms `po` shows an expression after applying Fix-It(s)."""
 
diff --git a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
index f99df6d593127..582ddf5f961a8 100644
--- a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
+++ b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """
         Tests a forward declared template and a normal template in the same
diff --git a/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py b/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
index 6093ef91ac1f0..60a2ab198fd3f 100644
--- a/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
+++ b/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
@@ -9,6 +9,8 @@
 
 
 class FPNaNTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
index 35c4f05d0edb2..29f546e815c98 100644
--- a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
+++ b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
@@ -7,6 +7,8 @@
 
 
 class FrameVariableAnonymousUnionsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Tests that frame variable looks into anonymous unions"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py b/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
index 33648678da797..a09c4978c872a 100644
--- a/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
+++ b/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
@@ -8,6 +8,8 @@
 
 
 class TestFrameVarDepthAndElemCount(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that bool types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py b/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
index 92973536889f6..16b1b3f9a5daa 100644
--- a/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
+++ b/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
@@ -17,6 +17,8 @@
 
 @requireExpressionEvaluation
 class TestFunctionCallFromObjectFile(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_lib1(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "lib1_func")
diff --git a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
index 3e11b8c533923..001b657b4eb9f 100644
--- a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
+++ b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestFunctionQualifiers(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
index 94348fc1745f6..93dae5c286f27 100644
--- a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
+++ b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
@@ -9,6 +9,8 @@
 
 @requireExpressionEvaluation
 class TestCppGlobalOperators(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def prepare_executable_and_get_frame(self):
         self.build()
 
diff --git a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
index 0056a26f72f5a..74094673a3095 100644
--- a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
+++ b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """
         Test debugging a binary that has two templates with the same name
diff --git a/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
index 942092223e55e..40dc8053437c0 100644
--- a/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
+++ b/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
@@ -10,6 +10,8 @@
 
 
 class TestStlIncompleteTypes(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
index abb8dd69e0c5a..dc8c3020192e9 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
@@ -5,6 +5,8 @@
 
 
 class TestCppIncompleteTypes(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIf(compiler="gcc")
     def test_limit_debug_info(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
index 35a8a87cec8ea..8a1c03e8164bc 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
@@ -10,6 +10,8 @@
 
 
 class TestCppIncompleteTypeMembers(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIf(oslist=["darwin", "macos"], debug_info="gmodules")
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/inlines/TestInlines.py b/lldb/test/API/lang/cpp/inlines/TestInlines.py
index 06b4dee67928c..d6a721a960773 100644
--- a/lldb/test/API/lang/cpp/inlines/TestInlines.py
+++ b/lldb/test/API/lang/cpp/inlines/TestInlines.py
@@ -8,6 +8,8 @@
 
 
 class InlinesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py b/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
index f0b5ba278f79f..1b4acb8ff0ead 100644
--- a/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
+++ b/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
@@ -1,4 +1,9 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.requireExpressionEvaluation])
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.requireExpressionEvaluation],
+    test_with_pdb_debug_info=True,
+)
diff --git a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
index 311a59da0edb2..ebd9997959588 100644
--- a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
+++ b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
@@ -5,6 +5,8 @@
 
 
 class TestMembersAndLocalsWithSameName(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_when_stopped_in_method(self):
         self._load_exe()
 
diff --git a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
index 9dcb8fb91a1ae..9c42fd94ce3b9 100644
--- a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
@@ -11,6 +11,7 @@
 from lldbsuite.test import lldbplatformutil
 
 class NamespaceLookupTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py b/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
index f0b5ba278f79f..1b4acb8ff0ead 100644
--- a/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
+++ b/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
@@ -1,4 +1,9 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.requireExpressionEvaluation])
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.requireExpressionEvaluation],
+    test_with_pdb_debug_info=True,
+)
diff --git a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
index 9cf439b965f6f..2ad36e66257df 100644
--- a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
+++ b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
@@ -9,6 +9,8 @@
 
 
 class TestNestedClassWithParentInAnotherCU(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_nested_class_with_parent_in_another_cu(self):
         self.main_source_file = lldb.SBFileSpec("main.cpp")
         self.build()
diff --git a/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py b/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
index d16aaa14153fd..b1136daec2326 100644
--- a/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
+++ b/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
@@ -10,6 +10,8 @@
 
 
 class NoUniqueAddressTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
index 2e67ba364b3c8..5bbca2a351300 100644
--- a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
+++ b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
@@ -5,6 +5,8 @@
 
 
 class TestOperatorOverload(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_overload(self):
         self.build()
         (target, process, thread, main_breakpoint) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
index c78765e2e1808..c4fb8e0aacb99 100644
--- a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
+++ b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
@@ -10,6 +10,8 @@
 
 @requireExpressionEvaluation
 class RvalueReferencesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     # rdar://problem/11479676
     @expectedFailureAll(
         compiler="icc",
diff --git a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
index defe353cd0fd1..1ad150512090c 100644
--- a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
+++ b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
index 9a866542088bb..934be881b779b 100644
--- a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
+++ b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
@@ -10,6 +10,8 @@
 
 @requireExpressionEvaluation
 class CPPStaticMethodsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_with_run_command(self):
         """Test that static methods are properly distinguished from regular methods"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py b/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
index 4f21c69e890cc..37d2033a0eb7e 100644
--- a/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
+++ b/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
@@ -5,6 +5,7 @@
 
 
 class TestTemplateAlias(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, extra_flags):
diff --git a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
index 1a8ff0f414031..adff1a3b6d4e1 100644
--- a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
+++ b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
@@ -13,6 +13,7 @@
 
 @skipIfWasm  # no expression evaluation
 class TemplateArgsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
     TEST_WITH_PDB_DEBUG_INFO = True
 
diff --git a/lldb/test/API/lang/cpp/thunk/TestThunk.py b/lldb/test/API/lang/cpp/thunk/TestThunk.py
index 9370c1c58c18b..cd722788c5a68 100644
--- a/lldb/test/API/lang/cpp/thunk/TestThunk.py
+++ b/lldb/test/API/lang/cpp/thunk/TestThunk.py
@@ -5,6 +5,8 @@
 
 
 class ThunkTest(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_step_through_thunk(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "testit")
diff --git a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
index 8c9fe09060106..81308a3dc6def 100644
--- a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
+++ b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
@@ -10,6 +10,8 @@
 
 
 class TestCppTypeLookup(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def check_value(self, value, ivar_name, ivar_value):
         self.assertSuccess(value.GetError(), "Invalid valobj")
         ivar = value.GetChildMemberWithName(ivar_name)
diff --git a/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py b/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
index 265a96f7da152..9bdb42e8bcb83 100644
--- a/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
+++ b/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
@@ -9,6 +9,8 @@
 
 
 class TestTypeLookupAnonStruct(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_lookup_anon_struct(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py b/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
index dbaa50e76c546..1dbc51d7d3ac5 100644
--- a/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
+++ b/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
@@ -9,6 +9,8 @@
 
 
 class TestTypeLookupDuplicate(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_namespace_only(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py b/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
index 7e9f6967a1288..9ec4fd043016d 100644
--- a/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
+++ b/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
@@ -16,6 +16,8 @@ class TestCaseTypedefToOuterFwd(TestBase):
     in main.o or lib.o.
     """
 
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def check_global_var(self, target, name: str):
         var = target.FindFirstGlobalVariable(name)
         self.assertSuccess(var.GetError(), f"Found {name}")
diff --git a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
index 96e34d52c834c..6f0db022fa08f 100644
--- a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
+++ b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
@@ -25,6 +25,8 @@
 
 @requireExpressionEvaluation
 class UnicodeLiteralsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_expr1(self):
         """Test that the expression parser returns proper Unicode strings."""
         self.rdar12991846(expr=1)
diff --git a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
index 69ef8ea1445c1..92934b8d2d51f 100644
--- a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
@@ -9,6 +9,8 @@
 
 
 class UniqueTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test for unique types of std::vector<long> and std::vector<short>."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py b/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
index 9f41bbeee0636..35107dc2435a9 100644
--- a/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
+++ b/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
@@ -9,6 +9,7 @@
 
 
 class UniqueTypesTestCase3(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, debug_flags):
diff --git a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
index dfd6ab5e71d29..232f53ef980ad 100644
--- a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
+++ b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
@@ -6,6 +6,8 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def common_setup(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py b/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
index 1311a14932621..0dc52254cb21d 100644
--- a/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
+++ b/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
@@ -1,3 +1,3 @@
 from lldbsuite.test import lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
index f17d5a707c9e3..9f49dad2c10ea 100644
--- a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -10,6 +10,8 @@
 
 
 class CxxWCharTTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that C++ supports wchar_t correctly."""
         self.build()
diff --git a/lldb/test/API/python_api/frame/TestFrames.py b/lldb/test/API/python_api/frame/TestFrames.py
index 38e534a0251d2..2f5fd1c7bf1a0 100644
--- a/lldb/test/API/python_api/frame/TestFrames.py
+++ b/lldb/test/API/python_api/frame/TestFrames.py
@@ -12,6 +12,8 @@
 
 
 class FrameAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @skipIfWasm  # Wasm exposes no register sets, so there is no pc or sp register to read
     def test_get_arg_vals_for_call_stack(self):
         """Exercise SBFrame.GetVariables() API to get argument vals."""
diff --git a/lldb/test/API/python_api/frame_list/TestSBFrameList.py b/lldb/test/API/python_api/frame_list/TestSBFrameList.py
index f348ce492e547..f38bfbd9b3731 100644
--- a/lldb/test/API/python_api/frame_list/TestSBFrameList.py
+++ b/lldb/test/API/python_api/frame_list/TestSBFrameList.py
@@ -9,6 +9,8 @@
 
 
 class FrameListAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_frame_list_api(self):
         """Test SBThread.GetFrames() returns a valid SBFrameList."""
         self.build()
diff --git a/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py b/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
index a09c4a71c9948..5efb4e014f25b 100644
--- a/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
+++ b/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
@@ -5,6 +5,8 @@
 
 
 class CommandOverrideCallback(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number("main.c", "Hello world.")
diff --git a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
index ca1f0873242e0..a6b3b1a89c271 100644
--- a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
@@ -9,6 +9,8 @@
 
 
 class FrameUtilsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
index b24d4796d53fa..131e8b2573a82 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -10,6 +10,8 @@
 
 @requireThreadSupport
 class LLDBIteratorTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
index 38b1e530c730e..c91b8064772e7 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -10,6 +10,8 @@
 
 @requireThreadSupport
 class RegistersIteratorTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
index 221a20b4c44cf..59e307f69e0e5 100644
--- a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -10,6 +10,8 @@
 
 
 class ThreadsStackTracesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_stack_traces(self):
         """Test SBprocess and SBThread APIs with printing of the stack traces."""
         self.build()
diff --git a/lldb/test/API/python_api/module_section/TestModuleAndSection.py b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
index 6086370375757..c37bf77dbdc65 100644
--- a/lldb/test/API/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
@@ -10,6 +10,7 @@
 
 
 class ModuleAndSectionAPIsTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_module_and_section(self):
diff --git a/lldb/test/API/python_api/process/TestProcessAPI.py b/lldb/test/API/python_api/process/TestProcessAPI.py
index a31b63403f140..ab87a60f9bb10 100644
--- a/lldb/test/API/python_api/process/TestProcessAPI.py
+++ b/lldb/test/API/python_api/process/TestProcessAPI.py
@@ -10,6 +10,8 @@
 
 
 class ProcessAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py b/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
index 784f3e177d970..ba2f828c482c2 100644
--- a/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
+++ b/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
@@ -5,6 +5,8 @@
 
 
 class TestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         """Test that SBType.GetBasicType unwraps typedefs."""
         self.build()
diff --git a/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py b/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
index a3d43c1bdeeb2..dec4bce74aac7 100644
--- a/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
+++ b/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
@@ -1,3 +1,3 @@
 import lldbsuite.test.lldbinline as lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
index 0d3209b355e00..287e8ae6706c0 100644
--- a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
+++ b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
@@ -10,6 +10,8 @@
 
 
 class SymbolContextTwoFilesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @expectedFailureAll(oslist=["windows"])
     def test_lookup_by_address(self):
         """Test lookup by address in a module with multiple compilation units"""
diff --git a/lldb/test/API/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py
index 86c2c838746e2..61a2fa71383b4 100644
--- a/lldb/test/API/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/API/python_api/thread/TestThreadAPI.py
@@ -10,6 +10,7 @@
 
 
 class ThreadAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_get_process(self):
diff --git a/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py b/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
index 7600a388711dd..33f08b266ae37 100644
--- a/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
+++ b/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
@@ -13,6 +13,7 @@
 
 
 class ModuleUnifiedSectionList(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @requirePlatform(["linux", "freebsd", "netbsd"])
diff --git a/lldb/test/API/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py
index a8c6141413bc4..08538cb761e25 100644
--- a/lldb/test/API/python_api/value/TestValueAPI.py
+++ b/lldb/test/API/python_api/value/TestValueAPI.py
@@ -9,6 +9,7 @@
 
 
 class ValueAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py b/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
index 8e0c54becfbd5..af676e15209c6 100644
--- a/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
+++ b/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
@@ -5,6 +5,8 @@
 
 
 class ValueAPIVoidStarTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
index 5e9e6861f4f24..aa87427018737 100644
--- a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
@@ -9,6 +9,7 @@
 
 
 class ChangeValueAPITestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
index 82de6e126a3e5..9356e35a1f888 100644
--- a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
+++ b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
@@ -5,6 +5,8 @@
 
 
 class ValueAPIEmptyClassTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
         line = line_number("main.cpp", "// Break at this line")
diff --git a/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py b/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
index 96eb0dfa2ebc8..821a11ff4d483 100644
--- a/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
+++ b/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
@@ -4,6 +4,8 @@
 
 
 class ValueAPIGetExpressionPath(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
index 8e7559abb2d53..3824ed0decc69 100644
--- a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
@@ -8,6 +8,7 @@
 
 
 class ValueVarUpdateTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_with_process_launch_api(self):
diff --git a/lldb/test/API/sample_test/TestSampleInlineTest.py b/lldb/test/API/sample_test/TestSampleInlineTest.py
index af926de18ab34..7b80914c7a66d 100644
--- a/lldb/test/API/sample_test/TestSampleInlineTest.py
+++ b/lldb/test/API/sample_test/TestSampleInlineTest.py
@@ -4,4 +4,4 @@
 
 from lldbsuite.test import lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals(), None)
+lldbinline.MakeInlineTest(__file__, globals(), None, test_with_pdb_debug_info=True)
diff --git a/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py b/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
index b3c6627641775..dc8258857b700 100644
--- a/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
+++ b/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
@@ -9,6 +9,8 @@
 
 
 class HiddenFrameMarkerTest(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @unicode_test
     @expectedFailureWindows(
         bugnumber="https://github.com/llvm/llvm-project/issues/191459"
diff --git a/lldb/test/API/types/TestCharType.py b/lldb/test/API/types/TestCharType.py
index c4c9a14b11b22..49b692ce36871 100644
--- a/lldb/test/API/types/TestCharType.py
+++ b/lldb/test/API/types/TestCharType.py
@@ -8,6 +8,8 @@
 
 
 class CharTypeTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_char_type(self):
         """Test that char-type variables are displayed correctly."""
         self.build_and_run("char.cpp", ["char"], qd=True)
diff --git a/lldb/test/API/types/TestCharTypeExpr.py b/lldb/test/API/types/TestCharTypeExpr.py
index 11a1cfec6670a..fc1622f08e167 100644
--- a/lldb/test/API/types/TestCharTypeExpr.py
+++ b/lldb/test/API/types/TestCharTypeExpr.py
@@ -8,6 +8,8 @@
 
 
 class CharTypeExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_char_type(self):
         """Test that char-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("char.cpp", ["char"], qd=True)
diff --git a/lldb/test/API/types/TestDoubleTypes.py b/lldb/test/API/types/TestDoubleTypes.py
index fc61c17603739..b31c82198ee08 100644
--- a/lldb/test/API/types/TestDoubleTypes.py
+++ b/lldb/test/API/types/TestDoubleTypes.py
@@ -12,6 +12,8 @@
 
 
 class DoubleTypesTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_double_type(self):
         """Test that double-type variables are displayed correctly."""
         self.build_and_run("double.cpp", set(["double"]))
diff --git a/lldb/test/API/types/TestDoubleTypesExpr.py b/lldb/test/API/types/TestDoubleTypesExpr.py
index 2c8bfe9511a8b..ff0bc8cd58f6d 100644
--- a/lldb/test/API/types/TestDoubleTypesExpr.py
+++ b/lldb/test/API/types/TestDoubleTypesExpr.py
@@ -12,6 +12,8 @@
 
 
 class DoubleTypesExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?
diff --git a/lldb/test/API/types/TestFloatTypes.py b/lldb/test/API/types/TestFloatTypes.py
index 26e7b5e8c9f7a..e1e244d98a41c 100644
--- a/lldb/test/API/types/TestFloatTypes.py
+++ b/lldb/test/API/types/TestFloatTypes.py
@@ -12,6 +12,8 @@
 
 
 class FloatTypesTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_float_type(self):
         """Test that float-type variables are displayed correctly."""
         self.build_and_run("float.cpp", set(["float"]))
diff --git a/lldb/test/API/types/TestFloatTypesExpr.py b/lldb/test/API/types/TestFloatTypesExpr.py
index a3d5b119692dd..fc5f6d8661b4e 100644
--- a/lldb/test/API/types/TestFloatTypesExpr.py
+++ b/lldb/test/API/types/TestFloatTypesExpr.py
@@ -12,6 +12,8 @@
 
 
 class FloatTypesExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?
diff --git a/lldb/test/API/types/TestIntegerType.py b/lldb/test/API/types/TestIntegerType.py
index 76314de385e21..be197e5512dcc 100644
--- a/lldb/test/API/types/TestIntegerType.py
+++ b/lldb/test/API/types/TestIntegerType.py
@@ -8,6 +8,8 @@
 
 
 class IntegerTypesTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_int_type(self):
         """Test that int-type variables are displayed correctly."""
         self.build_and_run("int.cpp", ["int"])
diff --git a/lldb/test/API/types/TestIntegerTypeExpr.py b/lldb/test/API/types/TestIntegerTypeExpr.py
index d7c81d53ae941..85a15f38666dd 100644
--- a/lldb/test/API/types/TestIntegerTypeExpr.py
+++ b/lldb/test/API/types/TestIntegerTypeExpr.py
@@ -8,6 +8,8 @@
 
 
 class IntegerTypeExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @requireDarwin
     def test_unsigned_short_type_from_block(self):
         """Test that 'unsigned short'-type variables are displayed correctly from a block."""
diff --git a/lldb/test/API/types/TestLongTypes.py b/lldb/test/API/types/TestLongTypes.py
index f13b57dfa8a01..b0f0c71c1ebf4 100644
--- a/lldb/test/API/types/TestLongTypes.py
+++ b/lldb/test/API/types/TestLongTypes.py
@@ -8,6 +8,8 @@
 
 
 class LongTypesTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_long_type(self):
         """Test that long-type variables are displayed correctly."""
         self.build_and_run("long.cpp", ["long"])
diff --git a/lldb/test/API/types/TestLongTypesExpr.py b/lldb/test/API/types/TestLongTypesExpr.py
index 6f57edc085fef..007ee248702b6 100644
--- a/lldb/test/API/types/TestLongTypesExpr.py
+++ b/lldb/test/API/types/TestLongTypesExpr.py
@@ -8,6 +8,8 @@
 
 
 class LongTypesExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_long_type(self):
         """Test that long-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("long.cpp", ["long"])
diff --git a/lldb/test/API/types/TestRecursiveTypes.py b/lldb/test/API/types/TestRecursiveTypes.py
index 79bb008e3c923..b3ca0468d3260 100644
--- a/lldb/test/API/types/TestRecursiveTypes.py
+++ b/lldb/test/API/types/TestRecursiveTypes.py
@@ -8,6 +8,7 @@
 
 
 class RecursiveTypesTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/types/TestShortType.py b/lldb/test/API/types/TestShortType.py
index 5e7433cd3fe70..e073797a09158 100644
--- a/lldb/test/API/types/TestShortType.py
+++ b/lldb/test/API/types/TestShortType.py
@@ -8,6 +8,8 @@
 
 
 class ShortTypeTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_short_type(self):
         """Test that short-type variables are displayed correctly."""
         self.build_and_run("short.cpp", ["short"])
diff --git a/lldb/test/API/types/TestShortTypeExpr.py b/lldb/test/API/types/TestShortTypeExpr.py
index 71ee09caa0263..c4420f5bc5092 100644
--- a/lldb/test/API/types/TestShortTypeExpr.py
+++ b/lldb/test/API/types/TestShortTypeExpr.py
@@ -8,6 +8,8 @@
 
 
 class ShortExprTestCase(AbstractBase.GenericTester):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     def test_short_type(self):
         """Test that short-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("short.cpp", ["short"])
diff --git a/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py b/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
index 5d51e0bd6b1ee..84795bd0ab823 100644
--- a/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
+++ b/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
@@ -6,6 +6,8 @@
 
 @skipIfTargetDoesNotSupportSharedLibraries()
 class MissingDllTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @requireWindows
     def test(self):
         """
diff --git a/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py b/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
index 14000a1cd137f..c39834b28d148 100644
--- a/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
+++ b/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
@@ -8,6 +8,7 @@
 
 
 class ReplaceDllTestCase(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @requireWindows
diff --git a/lldb/test/API/windows/thread/TestThreadName.py b/lldb/test/API/windows/thread/TestThreadName.py
index 7680790a6d49f..042cd7df8c884 100644
--- a/lldb/test/API/windows/thread/TestThreadName.py
+++ b/lldb/test/API/windows/thread/TestThreadName.py
@@ -9,6 +9,8 @@
 
 
 class TestThreadName(TestBase):
+    TEST_WITH_PDB_DEBUG_INFO = True
+
     @requireWindows
     @skipIfWindows(windows_version=["<", "10.0.14393"])
     def test_with_thread_description(self):

>From a477b21cd32c19dc06612d5274986a34c6d60916 Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit at apple.com>
Date: Fri, 9 Oct 2026 15:51:24 +0100
Subject: [PATCH 2/3] [lldb][test] Make pdb a default debug info category

---
 lldb/docs/resources/test.md                      |  4 ++--
 .../packages/Python/lldbsuite/test/lldbinline.py |  2 --
 lldb/packages/Python/lldbsuite/test/lldbtest.py  | 12 ------------
 .../Python/lldbsuite/test/test_categories.py     |  2 +-
 .../API/attach/TestWindowsAttachBreakpoint.py    |  2 --
 .../location-dot/TestBreakpointLocationDot.py    |  2 --
 .../API/commands/dwim-print/TestDWIMPrint.py     |  1 +
 .../anonymous-struct/TestCallUserAnonTypedef.py  |  2 --
 .../TestArgumentPassingRestrictions.py           |  1 +
 .../bitfield_enums/TestBitfieldEnums.py          |  2 --
 .../call-function/TestCallStdStringFunction.py   |  2 --
 .../call-function/TestCallStopAndContinue.py     |  2 --
 .../call-function/TestCallUserDefinedFunction.py |  2 --
 .../TestCastIntToAnonymousEnum.py                |  2 --
 .../commands/expression/char/TestExprsChar.py    |  1 -
 ...ssTemplateSpecializationParametersHandling.py |  2 --
 .../TestImportDefinitionArrayType.py             |  2 --
 ...estCodegenCrashTypedefDeclNotInDeclContext.py |  6 +++++-
 .../TestCompletionCrashIncompleteRecord.py       |  2 +-
 .../TestCompletionInLambdaAndUnnamedClass.py     |  1 -
 .../context-object/TestContextObject.py          |  2 --
 .../TestDeletingImplicitCopyConstructor.py       |  1 -
 .../diagnostics/TestExprDiagnostics.py           |  1 +
 .../dollar-in-variable/TestDollarInVariable.py   |  2 --
 .../expr-in-syscall/TestExpressionInSyscall.py   |  2 --
 .../expr_inside_lambda/TestExprInsideLambdas.py  |  1 -
 .../API/commands/expression/fixits/TestFixIts.py |  2 --
 .../expression/formatters/TestFormatters.py      |  2 --
 ...TestFunctionTemplateSpecializationTempArgs.py |  1 +
 .../TestIgnoreArtificialConstructors.py          |  8 +++++++-
 ...stImportBaseClassWhenClassHasDerivedMember.py |  2 +-
 .../inline-namespace/TestInlineNamespace.py      |  1 +
 .../expression/int128/Test128BitsInteger.py      |  9 ++++++++-
 .../TestIRInterpreterPHINodes.py                 |  2 --
 .../memory-allocation/TestMemoryAllocSettings.py |  2 --
 .../namespace-alias/TestInlineNamespaceAlias.py  |  1 +
 .../expression/nested/TestNestedExpressions.py   |  2 ++
 .../no-deadlock/TestExprDoesntBlock.py           |  2 --
 .../expression/options/TestExprOptions.py        |  2 --
 .../TestPersistentPtrUpdate.py                   |  2 --
 .../persistent_result/TestPersistentResult.py    |  2 --
 .../TestNestedPersistentTypes.py                 |  2 --
 .../persistent_types/TestPersistentTypes.py      |  2 --
 .../TestPersistentVariables.py                   |  2 --
 .../expression/pr35310/TestExprsBug35310.py      |  2 --
 .../commands/expression/pr52257/TestExprCrash.py |  2 --
 .../expression/radar_8638051/Test8638051.py      |  2 --
 .../radar_9531204/TestPrintfAfterUp.py           |  2 --
 .../radar_9673664/TestExprHelpExamples.py        |  2 --
 ...stRegressionAccessFunctionTemplateInRecord.py |  2 +-
 .../save_jit_objects/TestSaveJITObjects.py       |  2 +-
 .../TestStaticInitializers.py                    |  2 --
 .../API/commands/expression/test/TestExprs.py    |  2 --
 .../API/commands/expression/test/TestExprs2.py   |  2 --
 .../expression/top-level/TestTopLevelExprs.py    |  2 --
 .../unicode-in-variable/TestUnicodeInVariable.py |  2 +-
 .../unwind_expression/TestUnwindExpression.py    |  1 -
 .../expression/urem-sign/TestScalarURem.py       |  6 +++++-
 .../expression/xvalue/TestXValuePrinting.py      |  1 +
 .../var-dil/expr/Casts/TestFrameVarDILCast.py    |  1 +
 .../frame/var-scope/TestFrameVariableScope.py    |  2 +-
 .../direct-ivar/cpp/TestFrameVarDirectIvarCpp.py |  2 --
 .../frame/var/repeat/TestFrameVarRepeat.py       |  2 --
 .../TestReverseContinueCommandNotSupported.py    |  2 --
 .../API/commands/source/info/TestSourceInfo.py   |  2 +-
 .../commands/target/basic/TestTargetCommand.py   |  1 -
 .../lookup/TestImageLookupPCExpression.py        |  2 --
 .../commands/thread/select/TestThreadSelect.py   |  2 --
 .../functionalities/alias/TestBtAliasRepeat.py   |  2 --
 .../test/API/functionalities/alias/TestPAlias.py |  2 --
 .../TestBreakpointByFileColonLine.py             |  2 --
 .../TestBreakpointByLineAndColumn.py             |  2 ++
 .../breakpoint_command/TestRegexpBreakCommand.py |  2 --
 .../TestBreakpointConditions.py                  |  2 --
 .../breakpoint_ids/TestBreakpointIDs.py          |  2 ++
 .../TestBreakpointLanguage.py                    |  2 ++
 .../TestBreakpointLocations.py                   |  2 --
 .../TestBreakOnOverload.py                       |  2 --
 .../breakpoint_options/TestBreakpointOptions.py  |  2 --
 .../TestBreakpointResetUponRun.py                |  1 -
 .../TestBreakpointSetRestart.py                  |  1 -
 .../default_source_file/TestDefaultSourceFile.py |  2 --
 .../delayed_breakpoints/TestDelayedBreakpoint.py |  2 --
 .../TestBreakpointsWithNoTargets.py              |  2 --
 .../TestInlinedBreakpoints.py                    |  2 --
 .../TestFileBreakpointsSameCUName.py             |  2 --
 .../source_regexp/TestSourceRegexBreakpoints.py  |  2 --
 .../TestStepOverBreakpoint.py                    |  2 --
 .../TestThreadPlanUserBreakpoint.py              |  2 --
 .../TestUpdateBreakpointCondition.py             |  2 --
 .../conditional_break/TestConditionalBreak.py    |  2 --
 .../bytecode-summary/TestBytecodeSummary.py      |  1 +
 .../bytecode-synthetic/TestBytecodeSynthetic.py  |  2 --
 .../TestDataFormatterCallbackMatching.py         |  2 --
 .../TestCustomSummaryLLVMFormat.py               |  2 --
 .../TestDataFormatterAdv.py                      |  2 --
 .../TestDataFormatterCaching.py                  |  2 --
 .../TestDataFormatterCategories.py               |  2 --
 .../data-formatter-cpp/TestDataFormatterCpp.py   |  1 +
 .../TestDataFormatterDisabling.py                |  2 --
 .../TestDataFormatterEnumFormat.py               |  2 --
 .../TestDataFormatterGlobals.py                  |  2 --
 .../TestDataFormatterNamedSummaries.py           |  2 --
 .../TestDataFormatterPtrMatching.py              |  1 +
 .../TestPtrToArrayFormatting.py                  |  2 --
 .../TestDataFormatterPythonSynth.py              |  2 --
 .../TestDataFormatterScript.py                   |  2 --
 .../TestDataFormatterSkipSummary.py              |  2 --
 .../TestDataFormatterSmartArray.py               |  2 --
 .../TestDataFormatterInvalidAtomic.py            |  2 --
 .../generic/atomic/TestDataFormatterStdAtomic.py |  1 -
 .../bitset/TestDataFormatterGenericBitset.py     |  1 -
 .../deque/TestDataFormatterGenericDeque.py       |  1 -
 .../error_code/TestDataFormatterStdErrorCode.py  |  1 -
 .../expected/TestDataFormatterStdExpected.py     |  1 -
 .../TestDataFormatterGenericForwardList.py       |  1 -
 .../iterator/TestDataFormatterStdIterator.py     |  1 -
 .../generic/list/TestDataFormatterGenericList.py |  1 -
 .../loop/TestDataFormatterGenericListLoop.py     |  1 -
 .../generic/map/TestDataFormatterStdMap.py       |  1 -
 .../multimap/TestDataFormatterGenericMultiMap.py |  1 -
 .../multiset/TestDataFormatterGenericMultiSet.py |  1 -
 .../optional/TestDataFormatterGenericOptional.py |  1 -
 .../ordering/TestDataFormatterStdOrdering.py     |  1 -
 .../generic/path/TestDataFormatterStdPath.py     |  1 -
 .../generic/queue/TestDataFormatterStdQueue.py   |  1 -
 .../generic/set/TestDataFormatterGenericSet.py   |  1 -
 .../shared_ptr/TestDataFormatterStdSharedPtr.py  |  1 -
 .../TestDataFormatterStdSourceLocation.py        |  1 -
 .../generic/span/TestDataFormatterStdSpan.py     |  1 -
 .../generic/string/TestDataFormatterStdString.py |  1 -
 .../TestDataFormatterStdStringView.py            |  1 -
 .../generic/tuple/TestDataFormatterStdTuple.py   |  1 -
 .../u8string/TestDataFormatterStdU8String.py     |  1 -
 .../TestDataFormatterStdU8StringView.py          |  1 -
 .../unique_ptr/TestDataFormatterStdUniquePtr.py  |  1 -
 .../TestDataFormatterGenericUnordered.py         |  1 -
 .../valarray/TestDataFormatterStdValarray.py     |  1 -
 .../variant/TestDataFormatterStdVariant.py       |  1 -
 .../generic/vbool/TestDataFormatterStdVBool.py   |  1 -
 .../generic/vector/TestDataFormatterStdVector.py |  1 -
 .../TestDataFormatterSynth.py                    |  2 --
 .../TestDataFormatterSynthType.py                |  2 --
 .../TestDataFormatterSynthVal.py                 |  2 --
 .../format-propagation/TestFormatPropagation.py  |  2 --
 .../TestFrameFormatSmallStruct.py                |  2 --
 .../hexcaps/TestDataFormatterHexCaps.py          |  2 --
 .../TestDataFormatterLanguageCategoryUpdates.py  |  2 --
 .../data-formatter/parray/TestPrintArray.py      |  2 --
 .../ptr_ref_typedef/TestPtrRef2Typedef.py        |  2 ++
 .../TestDataFormatterRefPtrRecursion.py          |  2 --
 .../TestRootReferenceChildren.py                 |  2 --
 .../TestSummaryStringSpecialChars.py             |  2 ++
 .../stringprinter/TestStringPrinter.py           |  2 --
 .../TestSummaryStringOnFail.py                   |  2 --
 .../TestSyntheticOneLineSummaries.py             |  2 --
 .../synthcapping/TestSyntheticCapping.py         |  2 --
 .../TestSyntheticSubscript.py                    |  2 --
 .../TestTypeSynthRequiresDeref.py                |  2 --
 .../TestTypeSummaryListScript.py                 |  2 --
 .../typedef_array/TestTypedefArray.py            |  6 +++++-
 .../TestUserFormatVsSummary.py                   |  2 --
 .../TestVarInAggregateMisuse.py                  |  2 ++
 .../TestDataFormatterVarScriptFormatting.py      |  1 +
 .../vector-types/TestVectorTypesFormatting.py    |  1 +
 .../functionalities/dead-strip/TestDeadStrip.py  |  2 --
 .../find-line-entry/TestFindLineEntry.py         |  2 --
 .../float-display/TestFloatDisplay.py            |  2 +-
 .../inferior-assert/TestInferiorAssert.py        |  5 +++++
 .../inferior-crashing/TestInferiorCrashing.py    |  2 --
 .../TestInferiorCrashingStep.py                  |  2 --
 .../recursive-inferior/TestRecursiveInferior.py  |  2 --
 .../TestRecursiveInferiorStep.py                 |  2 --
 .../inline-stepping/TestInlineStepping.py        |  6 +++++-
 .../jitloader_gdb/TestJITLoaderGDB.py            |  2 --
 .../TestLocationListLookup.py                    |  2 --
 .../memory/big-read/TestMemoryReadMaximumSize.py |  2 --
 .../memory/find/TestMemoryFind.py                |  1 +
 .../TestIndexVariable.py                         |  2 --
 .../TestNoASanExceptionAfterEvalOP_piece.py      |  6 +++++-
 .../TestPointerNumChildren.py                    |  2 --
 .../process_crash_info/TestProcessCrashInfo.py   |  2 --
 .../process_save_core/TestProcessSaveCore.py     |  2 --
 .../progress_reporting/TestProgressReporting.py  |  2 --
 lldb/test/API/functionalities/rerun/TestRerun.py |  2 --
 .../step-avoids-no-debug/TestStepNoDebug.py      |  2 --
 .../functionalities/target_var/TestTargetVar.py  |  1 +
 .../break_after_join/TestBreakAfterJoin.py       |  2 --
 .../crash_during_step/TestCrashDuringStep.py     |  2 --
 .../exit_during_break/TestExitDuringBreak.py     |  2 --
 .../thread/jump/TestThreadJump.py                |  2 --
 .../thread/state/TestThreadStates.py             |  2 --
 .../step_out_line0/TestThreadStepOutLine0.py     |  1 +
 .../thread/step_until/TestStepUntil.py           |  1 -
 .../type_find_first/TestFindFirstType.py         |  2 --
 .../type_get_module/TestTypeGetModule.py         |  1 +
 .../functionalities/type_types/TestFindTypes.py  |  2 ++
 .../TestUnusedInlinedParameters.py               |  2 ++
 .../unwind/zeroth_frame/TestZerothFrame.py       |  2 --
 .../valobj_errors/TestValueObjectErrors.py       |  2 --
 lldb/test/API/lang/c/anonymous/TestAnonymous.py  |  2 --
 .../API/lang/c/array_types/TestArrayTypes.py     |  2 --
 lldb/test/API/lang/c/enum_types/TestEnumTypes.py |  1 +
 .../API/lang/c/forward/TestForwardDeclaration.py |  1 -
 lldb/test/API/lang/c/fpeval/TestFPEval.py        |  2 --
 .../lang/c/function_types/TestFunctionTypes.py   |  2 --
 .../lang/c/inlines/TestRedefinitionsInInlines.py |  1 +
 .../lang/c/local_variables/TestLocalVariables.py |  2 --
 .../API/lang/c/non-mangled/TestCNonMangled.py    |  2 --
 .../register_variables/TestRegisterVariables.py  |  2 --
 lldb/test/API/lang/c/set_values/TestSetValues.py |  1 +
 lldb/test/API/lang/c/shared_lib/TestSharedLib.py |  2 --
 lldb/test/API/lang/c/sizeof/TestCSizeof.py       |  2 --
 .../API/lang/c/step-target/TestStepTarget.py     | 16 ++++++++++++----
 .../TestStepOverDoesntBlock.py                   |  2 --
 .../API/lang/c/stepping/TestThreadStepping.py    |  2 --
 lldb/test/API/lang/c/strings/TestCStrings.py     |  2 --
 .../API/lang/c/struct_types/TestStructTypes.py   | 11 ++++++++++-
 .../API/lang/c/unicode/TestUnicodeSymbols.py     |  1 +
 lldb/test/API/lang/c/unions/TestUnionMembers.py  |  2 --
 lldb/test/API/lang/c/vla/TestVLA.py              |  2 ++
 .../cpp/abi_tag_structors/TestAbiTagStructors.py |  2 +-
 lldb/test/API/lang/cpp/auto/TestCPPAuto.py       |  2 --
 lldb/test/API/lang/cpp/bool/TestCPPBool.py       |  2 --
 .../TestBreakOnCPP11Initializers.py              |  2 ++
 .../TestCPPBreakpointCommands.py                 |  1 +
 .../lang/cpp/builtin_types/char/TestCharTypes.py |  2 --
 .../lang/cpp/builtin_types/int/TestIntTypes.py   |  2 --
 .../builtin_types/long_int/TestLongIntTypes.py   |  2 --
 .../cpp/call-function/TestCallCPPFunction.py     |  2 --
 .../cpp/chained-calls/TestCppChainedCalls.py     |  2 --
 .../API/lang/cpp/char1632_t/TestChar1632T.py     |  2 --
 lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py |  2 --
 .../TestClassTemplateParameterPack.py            |  2 --
 .../TestTemplatePackArgs.py                      |  1 +
 .../lang/cpp/class_static/TestStaticVariables.py |  2 ++
 .../API/lang/cpp/class_types/TestClassTypes.py   |  2 --
 .../cpp/class_types/TestClassTypesDisassembly.py |  2 --
 .../TestConstStaticIntegralMember.py             |  1 +
 .../TestConstStaticIntegralMemberInt128.py       |  1 +
 .../lang/cpp/constructors/TestCppConstructors.py |  2 --
 .../TestCPPDereferencingReferences.py            |  1 +
 .../lang/cpp/dynamic-value/TestCppValueCast.py   |  1 -
 .../lang/cpp/enum-limits/TestCPPEnumLimits.py    |  1 -
 .../cpp/enum_promotion/TestCPPEnumPromotion.py   |  2 --
 .../const_method/TestExprInConstMethod.py        |  2 --
 .../TestExprInConstVolatileMethod.py             |  2 --
 .../TestExprOnCVQualifiedObjects.py              |  2 --
 .../fixit/TestExprInConstMethodWithFixit.py      |  2 --
 .../non_const_method/TestExprInNonConstMethod.py |  2 --
 .../TestExprInTemplateConstMethod.py             |  2 --
 .../TestExprInTemplateNonConstMethod.py          |  2 --
 .../API/lang/cpp/extern_c/TestExternCSymbols.py  |  9 ++++++++-
 lldb/test/API/lang/cpp/fixits/TestCppFixIts.py   |  2 --
 .../TestCppFloatingTypesSpecialization.py        |  1 +
 ...stCppForwardDeclaredTemplateSpecialization.py |  2 --
 .../cpp/forward/TestCPPForwardDeclaration.py     |  1 +
 lldb/test/API/lang/cpp/fpnan/TestFPNaN.py        |  2 --
 .../TestFrameVariableAnonymousUnions.py          |  2 --
 .../TestFrameVarDepthAndElemCount.py             |  2 --
 .../TestFunctionCallFromObjectFile.py            |  2 --
 .../TestCppFunctionQualifiers.py                 |  2 --
 .../TestCppFunctionRefQualifiers.py              |  1 +
 .../lang/cpp/function_refs/TestFunctionRefs.py   |  2 +-
 .../global_operators/TestCppGlobalOperators.py   |  2 --
 .../global_variables/TestCPPGlobalVariables.py   |  1 +
 .../TestCppIncompatibleClassTemplates.py         |  2 --
 .../TestStlIncompleteTypes.py                    |  2 --
 .../incomplete-types/TestCppIncompleteTypes.py   |  2 --
 .../members/TestCppIncompleteTypeMembers.py      |  2 --
 .../TestInlineNamespaceInTypename.py             |  2 ++
 lldb/test/API/lang/cpp/inlines/TestInlines.py    |  2 --
 .../API/lang/cpp/llvm-style/TestLLVMStyle.py     |  7 +------
 .../TestMembersAndLocalsWithSameName.py          |  2 --
 .../TestCppMultipleInheritance.py                |  2 --
 .../test/API/lang/cpp/namespace/TestNamespace.py |  2 ++
 .../lang/cpp/namespace/TestNamespaceLookup.py    |  1 -
 .../TestNamespaceConflicts.py                    |  7 +------
 .../TestNestedClassWithParentInAnotherCU.py      |  2 --
 .../cpp/nested-template/TestNestedTemplate.py    |  1 +
 .../cpp/no_unique_address/TestNoUniqueAddress.py |  2 --
 .../API/lang/cpp/nsimport/TestCppNsImport.py     |  1 +
 .../operator-overload/TestOperatorOverload.py    |  2 --
 .../API/lang/cpp/operators/TestCppOperators.py   |  1 -
 .../TestOverloadedFunctions.py                   |  2 --
 .../lang/cpp/preferred_name/TestPreferredName.py |  2 ++
 .../function-ptrs/TestRecursiveTypesFuncPtrs.py  |  1 +
 .../TestCppReferenceToOuterClass.py              |  4 ++--
 .../rvalue-references/TestRvalueReferences.py    |  2 --
 .../API/lang/cpp/signed_types/TestSignedTypes.py |  5 ++++-
 lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py   |  2 --
 .../cpp/static_members/TestCPPStaticMembers.py   |  6 +++---
 .../cpp/static_methods/TestCPPStaticMethods.py   |  2 --
 .../TestStepThroughTrampoline.py                 |  1 +
 lldb/test/API/lang/cpp/stl/TestSTL.py            |  1 +
 .../structured-binding/TestStructuredBinding.py  |  1 +
 .../lang/cpp/template-alias/TestTemplateAlias.py |  1 -
 .../TestTemplateSpecializationType.py            |  1 +
 .../API/lang/cpp/template/TestTemplateArgs.py    |  2 --
 lldb/test/API/lang/cpp/thunk/TestThunk.py        |  2 --
 .../lang/cpp/type_lookup/TestCppTypeLookup.py    |  2 --
 .../TestCppTypeLookupAnonStruct.py               |  2 --
 .../TestCppTypeLookupDuplicate.py                |  2 --
 .../TestTypedefToOuterFwd.py                     |  2 --
 lldb/test/API/lang/cpp/typedef/TestCppTypedef.py |  1 +
 .../cpp/unicode-literals/TestUnicodeLiterals.py  |  2 --
 .../TestCppUnionStaticMembers.py                 |  2 +-
 .../API/lang/cpp/unique-types/TestUniqueTypes.py |  2 --
 .../lang/cpp/unique-types2/TestUniqueTypes2.py   |  2 ++
 .../lang/cpp/unique-types3/TestUniqueTypes3.py   |  1 -
 .../lang/cpp/unsigned_types/TestUnsignedTypes.py |  1 +
 .../virtual-functions/TestCppVirtualFunctions.py |  2 --
 .../cpp/virtual-overload/TestVirtualOverload.py  |  2 +-
 lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py  |  2 --
 lldb/test/API/lang/mixed/TestMixedLanguages.py   |  2 ++
 .../compile_unit/TestCompileUnitAPI.py           |  1 +
 lldb/test/API/python_api/frame/TestFrames.py     |  2 --
 .../frame/get-variables/TestGetVariables.py      |  1 +
 .../python_api/frame/inlines/TestInlinedFrame.py |  1 +
 .../API/python_api/frame_list/TestSBFrameList.py |  2 --
 .../python_api/function_symbol/TestDisasmAPI.py  |  4 +++-
 .../python_api/function_symbol/TestSymbolAPI.py  |  4 +++-
 .../interpreter/TestCommandOverrideCallback.py   |  2 --
 .../python_api/lldbutil/frame/TestFrameUtils.py  |  2 --
 .../python_api/lldbutil/iter/TestLLDBIterator.py |  2 --
 .../lldbutil/iter/TestRegistersIterator.py       |  2 --
 .../lldbutil/process/TestPrintStackTraces.py     |  2 --
 .../module_section/TestModuleAndSection.py       |  1 -
 .../API/python_api/process/TestProcessAPI.py     |  2 --
 .../sbmodule/FindTypes/TestSBModuleFindTypes.py  |  1 +
 .../sbtype_basic_type/TestSBTypeBasicType.py     |  2 --
 .../TestSBValueConstAddrOf.py                    |  2 +-
 .../symbol-context/TestSymbolContext.py          |  4 +++-
 .../two-files/TestSymbolContextTwoFiles.py       |  2 --
 lldb/test/API/python_api/target/TestTargetAPI.py |  5 ++++-
 lldb/test/API/python_api/thread/TestThreadAPI.py |  1 -
 lldb/test/API/python_api/type/TestTypeList.py    |  3 +++
 .../TestModuleUnifiedSectionList.py              |  1 -
 lldb/test/API/python_api/value/TestValueAPI.py   |  1 -
 .../TestValueAPIAddressOfVoidStar.py             |  2 --
 .../python_api/value/change_ptr/TestChangePtr.py |  1 +
 .../value/change_values/TestChangeValueAPI.py    |  1 -
 .../value/empty_class/TestValueAPIEmptyClass.py  |  2 --
 .../TestValueAPIGetExpressionPath.py             |  2 --
 .../value/value_wrap/TestValueAPIWrapper.py      |  2 ++
 .../value_var_update/TestValueVarUpdate.py       |  1 -
 .../test/API/sample_test/TestSampleInlineTest.py |  2 +-
 lldb/test/API/symstore/TestSymStore.py           |  1 -
 .../TestHiddenFrameMarkers.py                    |  2 --
 lldb/test/API/test_utils/pdb/TestPdb.py          |  1 -
 lldb/test/API/types/TestCharType.py              |  2 --
 lldb/test/API/types/TestCharTypeExpr.py          |  2 --
 lldb/test/API/types/TestDoubleTypes.py           |  2 --
 lldb/test/API/types/TestDoubleTypesExpr.py       |  2 --
 lldb/test/API/types/TestFloatTypes.py            |  2 --
 lldb/test/API/types/TestFloatTypesExpr.py        |  2 --
 lldb/test/API/types/TestIntegerType.py           |  2 --
 lldb/test/API/types/TestIntegerTypeExpr.py       |  2 --
 lldb/test/API/types/TestLongTypes.py             |  2 --
 lldb/test/API/types/TestLongTypesExpr.py         |  2 --
 lldb/test/API/types/TestRecursiveTypes.py        |  1 -
 lldb/test/API/types/TestShortType.py             |  2 --
 lldb/test/API/types/TestShortTypeExpr.py         |  2 --
 .../windows/launch/missing-dll/TestMissingDll.py |  2 --
 .../windows/launch/replace-dll/TestReplaceDLL.py |  1 -
 lldb/test/API/windows/thread/TestThreadName.py   |  2 --
 366 files changed, 199 insertions(+), 539 deletions(-)

diff --git a/lldb/docs/resources/test.md b/lldb/docs/resources/test.md
index 87c2f5d9c61f4..77e15452f5dda 100644
--- a/lldb/docs/resources/test.md
+++ b/lldb/docs/resources/test.md
@@ -192,8 +192,8 @@ similar to what you want to do.
 
 Another thing this enables is having different variants for the same test
 case. By default, we run every test for two debug info formats, once with
-DWARF from the object files and another with a dSYM on macOS or split
-DWARF (DWO) on Linux. But there are many more things we can test
+DWARF from the object files and another with a dSYM on macOS, split DWARF
+(DWO) on Linux or PDB on Windows. But there are many more things we can test
 that are orthogonal to the test itself. On GreenDragon we have a matrix bot
 that runs the test suite under different configurations, with older host
 compilers and different DWARF versions.
diff --git a/lldb/packages/Python/lldbsuite/test/lldbinline.py b/lldb/packages/Python/lldbsuite/test/lldbinline.py
index 975d1ad8ec81f..969ba3d7eaa1e 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbinline.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbinline.py
@@ -212,7 +212,6 @@ def MakeInlineTest(
     decorators=None,
     name=None,
     build_dict=None,
-    test_with_pdb_debug_info=False,
 ):
     # Adjust the filename if it ends in .pyc.  We want filenames to
     # reflect the source python file, not the compiled variant.
@@ -236,7 +235,6 @@ def MakeInlineTest(
             test=test_func,
             name=name,
             _build_dict=build_dict,
-            TEST_WITH_PDB_DEBUG_INFO=test_with_pdb_debug_info,
         ),
     )
 
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index c5a5574412d9f..2e1dab2e6717b 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2189,11 +2189,6 @@ def no_reason(*args, **kwargs):
                             if enabled
                         ]
 
-                        # PDB is off by default, because it has a lot of failures
-                        # right now. See llvm.org/pr149498.
-                        if original_testcase.TEST_WITH_PDB_DEBUG_INFO:
-                            dbginfo_categories.append("pdb")
-
                     xfail_fns = getattr(attrvalue, "__variant_xfail__", {})
                     skip_fns = getattr(attrvalue, "__variant_skip__", {})
                     xfail_for_debug_info_cat_fn = xfail_fns.get("debug_info", no_reason)
@@ -2305,13 +2300,6 @@ class TestBase(Base, metaclass=LLDBTestCaseFactory):
     # test multiple times with various debug info types.
     NO_DEBUG_INFO_TESTCASE = False
 
-    TEST_WITH_PDB_DEBUG_INFO = False
-    """
-    Subclasses can set this to True to test with PDB in addition to the other debug info
-    types. This id off by default because many tests will fail due to missing functionality in PDB.
-    See llvm.org/pr149498.
-    """
-
     def generateSource(self, source):
         template = source + ".template"
         temp = os.path.join(self.getSourceDir(), template)
diff --git a/lldb/packages/Python/lldbsuite/test/test_categories.py b/lldb/packages/Python/lldbsuite/test/test_categories.py
index b8a764fb3349a..4bdb1d6b715e2 100644
--- a/lldb/packages/Python/lldbsuite/test/test_categories.py
+++ b/lldb/packages/Python/lldbsuite/test/test_categories.py
@@ -16,7 +16,7 @@
     "dwarf": True,
     "dwo": True,
     "dsym": True,
-    "pdb": False,
+    "pdb": True,
     "gmodules": False,
 }
 
diff --git a/lldb/test/API/attach/TestWindowsAttachBreakpoint.py b/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
index 4cbd67802b41f..83bc28e5f40c0 100644
--- a/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
+++ b/lldb/test/API/attach/TestWindowsAttachBreakpoint.py
@@ -13,8 +13,6 @@
 
 
 class WindowsAttachLoaderBreakpointTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def create_suspended_process(self, exe):
         """Create ``exe`` suspended and return its (pid, hProcess, hThread).
 
diff --git a/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py b/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
index b3d4e45c59b00..f1714753168f4 100644
--- a/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
+++ b/lldb/test/API/commands/breakpoint/location-dot/TestBreakpointLocationDot.py
@@ -4,8 +4,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_disable_enable(self):
         self.build()
         _, _, thread, bp = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/dwim-print/TestDWIMPrint.py b/lldb/test/API/commands/dwim-print/TestDWIMPrint.py
index 36098bc5941f8..dbdb35d31848c 100644
--- a/lldb/test/API/commands/dwim-print/TestDWIMPrint.py
+++ b/lldb/test/API/commands/dwim-print/TestDWIMPrint.py
@@ -179,6 +179,7 @@ def test_variable_expression_path(self):
         self._expect_cmd("dwim-print w.s", "frame variable")
         self._expect_cmd("dwim-print wp->s", "expression")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_direct_child_access(self):
         """Test dwim-print supports accessing members/ivars without qualification."""
         self.build()
diff --git a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
index 6c5b389c27028..76735fe62d5cd 100644
--- a/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
+++ b/lldb/test/API/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
@@ -15,8 +15,6 @@
 
 @requireExpressionEvaluation
 class TestExprLookupAnonStructTypedef(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test typedeffed untagged struct arguments for function call expressions"""
         self.build_and_run()
diff --git a/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py b/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
index 55bccb4f84e7a..f1eccf236c3bd 100644
--- a/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
+++ b/lldb/test/API/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
@@ -18,6 +18,7 @@
 @requireExpressionEvaluation
 class TestArgumentPassingRestrictions(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_argument_passing_restrictions(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py b/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
index 5877e26dc9ea9..05db4075870b8 100644
--- a/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
+++ b/lldb/test/API/commands/expression/bitfield_enums/TestBitfieldEnums.py
@@ -10,8 +10,6 @@
 
 
 class TestBitfieldEnum(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     # Prior to clang-19, clang's DWARF v2 is missing missing DW_AT_type which
     # causes unsigned_max to appear as -1 instead of the "max" enumerator, whose
     # value is 3. From 19 onward, DW_AT_type is added as long as strict DWARF
diff --git a/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py b/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
index 0d4a6109e1b12..174306ec8e66a 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallStdStringFunction.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class ExprCommandCallFunctionTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(
         compiler="icc", bugnumber="llvm.org/pr14437, fails with ICC 13.1"
     )
diff --git a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
index 13007cac0f201..0034c4d948799 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallStopAndContinue.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class ExprCommandCallStopContinueTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
index c0b6884734ad0..0172c120065e9 100644
--- a/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/test/API/commands/expression/call-function/TestCallUserDefinedFunction.py
@@ -15,8 +15,6 @@
 
 @requireExpressionEvaluation
 class ExprCommandCallUserDefinedFunction(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test return values of user defined function calls."""
         self.build()
diff --git a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
index a9f2e393c37e1..923f021d53399 100644
--- a/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
+++ b/lldb/test/API/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
@@ -11,8 +11,6 @@
 
 
 class TestCastIntToAnonymousEnum(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_cast_int_to_anonymous_enum(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/char/TestExprsChar.py b/lldb/test/API/commands/expression/char/TestExprsChar.py
index 495b1eb4073c1..63acbee0bf3c8 100644
--- a/lldb/test/API/commands/expression/char/TestExprsChar.py
+++ b/lldb/test/API/commands/expression/char/TestExprsChar.py
@@ -5,7 +5,6 @@
 
 
 class ExprCharTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, dictionary=None):
diff --git a/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
index 5cf9508892950..05e1744b15a49 100644
--- a/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
+++ b/lldb/test/API/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
@@ -13,8 +13,6 @@
 
 @requireExpressionEvaluation
 class TestClassTemplateSpecializationParametersHandling(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_class_template_specialization(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
index 25aacbb02eb31..15790bc52c159 100644
--- a/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
+++ b/lldb/test/API/commands/expression/codegen-crash-import-def-arraytype-element/TestImportDefinitionArrayType.py
@@ -5,8 +5,6 @@
 
 
 class TestImportDefinitionArrayType(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py b/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py
index f08c0dcbda983..3f72ebbbb2a06 100644
--- a/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py
+++ b/lldb/test/API/commands/expression/codegen-crash-typedefdecl-not-in_declcontext/TestCodegenCrashTypedefDeclNotInDeclContext.py
@@ -1,4 +1,8 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")],
+)
diff --git a/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py b/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
index ba2fcc78aea3b..f08c0dcbda983 100644
--- a/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
+++ b/lldb/test/API/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), [])
diff --git a/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
index 41105251318dc..0e3bfc2733a56 100644
--- a/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
+++ b/lldb/test/API/commands/expression/completion-in-lambda-and-unnamed-class/TestCompletionInLambdaAndUnnamedClass.py
@@ -4,5 +4,4 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    test_with_pdb_debug_info=True,
 )
diff --git a/lldb/test/API/commands/expression/context-object/TestContextObject.py b/lldb/test/API/commands/expression/context-object/TestContextObject.py
index f82fbdf3f7149..ebbb42418ae19 100644
--- a/lldb/test/API/commands/expression/context-object/TestContextObject.py
+++ b/lldb/test/API/commands/expression/context-object/TestContextObject.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class ContextObjectTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_context_object(self):
         """Tests expression evaluation in context of an object."""
         self.build()
diff --git a/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
index c62aede8ad304..ce74dd27cc179 100644
--- a/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
+++ b/lldb/test/API/commands/expression/deleting-implicit-copy-constructor/TestDeletingImplicitCopyConstructor.py
@@ -7,5 +7,4 @@
     [
         decorators.expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc"),
     ],
-    test_with_pdb_debug_info=True,
 )
diff --git a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
index 03851924aba45..57cb4bad18269 100644
--- a/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
+++ b/lldb/test/API/commands/expression/diagnostics/TestExprDiagnostics.py
@@ -200,6 +200,7 @@ def test_error_type(self):
         desc = value.GetObjectDescription()
         self.assertEqual(desc, None)
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_command_expr_sbdata(self):
         """Test the structured diagnostics data"""
         self.build()
diff --git a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
index 2d8c1df5f4efb..4e3be3f49de32 100644
--- a/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
+++ b/lldb/test/API/commands/expression/dollar-in-variable/TestDollarInVariable.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
index 0e4f669b9c711..c22987550efa8 100644
--- a/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/test/API/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
@@ -7,8 +7,6 @@
 
 
 class ExprSyscallTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureNetBSD
     def test_setpgid(self):
         self.build()
diff --git a/lldb/test/API/commands/expression/expr_inside_lambda/TestExprInsideLambdas.py b/lldb/test/API/commands/expression/expr_inside_lambda/TestExprInsideLambdas.py
index 01451c32b0a33..89e474ae843f5 100644
--- a/lldb/test/API/commands/expression/expr_inside_lambda/TestExprInsideLambdas.py
+++ b/lldb/test/API/commands/expression/expr_inside_lambda/TestExprInsideLambdas.py
@@ -12,7 +12,6 @@
 
 @requireExpressionEvaluation
 class ExprInsideLambdaTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def expectExprError(self, expr: str, expected: str):
diff --git a/lldb/test/API/commands/expression/fixits/TestFixIts.py b/lldb/test/API/commands/expression/fixits/TestFixIts.py
index c1c0e0838f41a..bfe11f6c6fcb9 100644
--- a/lldb/test/API/commands/expression/fixits/TestFixIts.py
+++ b/lldb/test/API/commands/expression/fixits/TestFixIts.py
@@ -9,8 +9,6 @@
 
 
 class ExprCommandWithFixits(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_dummy_target(self):
         """Test calling expressions in the dummy target with errors that can be fixed by the FixIts."""
 
diff --git a/lldb/test/API/commands/expression/formatters/TestFormatters.py b/lldb/test/API/commands/expression/formatters/TestFormatters.py
index 6d2981de4545f..fa48027bb64bf 100644
--- a/lldb/test/API/commands/expression/formatters/TestFormatters.py
+++ b/lldb/test/API/commands/expression/formatters/TestFormatters.py
@@ -11,8 +11,6 @@
 
 @requireExpressionEvaluation
 class ExprFormattersTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py b/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
index 3e8dc8b1d446e..83c329cfc8c60 100644
--- a/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
+++ b/lldb/test/API/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
@@ -6,6 +6,7 @@
 
 class TestFunctionTemplateSpecializationTempArgs(TestBase):
     @skipIf(oslist=["windows"], archs=["aarch64"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_function_template_specialization_temp_args(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py b/lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py
index 4de2a41ee700e..c0ad662cbaa9e 100644
--- a/lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py
+++ b/lldb/test/API/commands/expression/ignore-artificial-constructors/TestIgnoreArtificialConstructors.py
@@ -4,5 +4,11 @@
 lldbinline.MakeInlineTest(
     __file__,
     globals(),
-    [lldbinline.expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr43707")],
+    [
+        lldbinline.expectedFailureAll(
+            oslist=["windows"],
+            debug_info=decorators.no_match(["pdb"]),
+            bugnumber="llvm.org/pr43707",
+        )
+    ],
 )
diff --git a/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py b/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
index 0cdd46e00c068..c8308c16011e0 100644
--- a/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
+++ b/lldb/test/API/commands/expression/import_base_class_when_class_has_derived_member/TestImportBaseClassWhenClassHasDerivedMember.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals())
diff --git a/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py b/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
index c13eb13072849..e1ae0647dc416 100644
--- a/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
+++ b/lldb/test/API/commands/expression/inline-namespace/TestInlineNamespace.py
@@ -11,6 +11,7 @@
 
 @requireExpressionEvaluation
 class TestInlineNamespace(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/int128/Test128BitsInteger.py b/lldb/test/API/commands/expression/int128/Test128BitsInteger.py
index 5e1faabd3aea9..7a1b7c754638c 100644
--- a/lldb/test/API/commands/expression/int128/Test128BitsInteger.py
+++ b/lldb/test/API/commands/expression/int128/Test128BitsInteger.py
@@ -2,5 +2,12 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(
-    __file__, globals(), decorators.skipIf(archs=["arm$", "armv7k", "i386"])
+    __file__,
+    globals(),
+    [
+        decorators.skipIf(archs=["arm$", "armv7k", "i386"]),
+        decorators.expectedFailureAll(
+            debug_info=["pdb"], bugnumber="llvm.org/pr149498"
+        ),
+    ],
 )
diff --git a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
index 49bb01a646161..076e11603ed2a 100644
--- a/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
+++ b/lldb/test/API/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
@@ -9,8 +9,6 @@
 
 
 class IRInterpreterPHINodesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_phi_node_support(self):
         """Test support for PHI nodes in the IR interpreter."""
 
diff --git a/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py b/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
index fcaf385ba9a96..e7fae4d4066f6 100644
--- a/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
+++ b/lldb/test/API/commands/expression/memory-allocation/TestMemoryAllocSettings.py
@@ -9,8 +9,6 @@
 
 
 class TestMemoryAllocSettings(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test changing settings for expression memory allocation."""
         self.build()
diff --git a/lldb/test/API/commands/expression/namespace-alias/TestInlineNamespaceAlias.py b/lldb/test/API/commands/expression/namespace-alias/TestInlineNamespaceAlias.py
index cb876997e6480..fc6d51eaeaf01 100644
--- a/lldb/test/API/commands/expression/namespace-alias/TestInlineNamespaceAlias.py
+++ b/lldb/test/API/commands/expression/namespace-alias/TestInlineNamespaceAlias.py
@@ -14,6 +14,7 @@
 @requireExpressionEvaluation
 class TestInlineNamespace(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "16.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/commands/expression/nested/TestNestedExpressions.py b/lldb/test/API/commands/expression/nested/TestNestedExpressions.py
index 0dabe42f4e74c..67a7bc63c2bb3 100644
--- a/lldb/test/API/commands/expression/nested/TestNestedExpressions.py
+++ b/lldb/test/API/commands/expression/nested/TestNestedExpressions.py
@@ -9,6 +9,7 @@
 
 
 class NestedExpressions(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_enum_in_nested_structs(self):
         """
         Test expressions that references an enumeration in nested structs.
@@ -50,6 +51,7 @@ def test_static_in_nested_structs(self):
             result_value="Eleven",
         )
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_enum_in_nested_namespaces(self):
         """
         Test expressions that references an enumeration in nested namespaces.
diff --git a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
index d1629676d94a7..aae82c72d986a 100644
--- a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
@@ -10,8 +10,6 @@
 
 @requireThreadSupport
 class ExprDoesntDeadlockTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @add_test_categories(["basic_process"])
     def test_with_run_command(self):
         """Test that expr will time out and allow other threads to run if it blocks."""
diff --git a/lldb/test/API/commands/expression/options/TestExprOptions.py b/lldb/test/API/commands/expression/options/TestExprOptions.py
index 7dfb069be6199..02f844b34cc2b 100644
--- a/lldb/test/API/commands/expression/options/TestExprOptions.py
+++ b/lldb/test/API/commands/expression/options/TestExprOptions.py
@@ -14,8 +14,6 @@
 
 
 class ExprOptionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
index c1dfc8810cf3d..8b722b80bddb8 100644
--- a/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/test/API/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -9,8 +9,6 @@
 
 
 class PersistentPtrUpdateTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that we can have persistent pointer variables"""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py b/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
index 396392635452c..911b8f605939b 100644
--- a/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
+++ b/lldb/test/API/commands/expression/persistent_result/TestPersistentResult.py
@@ -9,8 +9,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
index 065ca6208fc2f..0c81d202f053f 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestNestedPersistentTypes.py
@@ -11,8 +11,6 @@
 
 @requireExpressionEvaluation
 class NestedPersistentTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_persistent_types(self):
         """Test that nested persistent types work."""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
index dd5894562684f..473937ab6e412 100644
--- a/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
+++ b/lldb/test/API/commands/expression/persistent_types/TestPersistentTypes.py
@@ -11,8 +11,6 @@
 
 @requireExpressionEvaluation
 class PersistenttypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_persistent_types(self):
         """Test that lldb persistent types works correctly."""
         self.build()
diff --git a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
index 3aae7f05e5ef1..d0d9358589a71 100644
--- a/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/API/commands/expression/persistent_variables/TestPersistentVariables.py
@@ -8,8 +8,6 @@
 
 
 class PersistentVariablesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_persistent_variables(self):
         """Test that lldb persistent variables works correctly."""
         self.build()
diff --git a/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py b/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
index 5d4af9c4d2db8..7c0c73ad1fd1c 100644
--- a/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
+++ b/lldb/test/API/commands/expression/pr35310/TestExprsBug35310.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class ExprBug35310(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
index 687cbdfa2de43..de8c7f7b58d4c 100644
--- a/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
+++ b/lldb/test/API/commands/expression/pr52257/TestExprCrash.py
@@ -9,8 +9,6 @@
 
 
 class ExprCrashTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_pr52257(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
index 6c4b6110143d5..78dbd241cd512 100644
--- a/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
+++ b/lldb/test/API/commands/expression/radar_8638051/Test8638051.py
@@ -8,8 +8,6 @@
 
 
 class Radar8638051TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_expr_commands(self):
         """The following expression commands should not crash."""
         self.build()
diff --git a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
index d71de81438a68..f869e4736e01b 100644
--- a/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/test/API/commands/expression/radar_9531204/TestPrintfAfterUp.py
@@ -11,8 +11,6 @@
 
 @requireExpressionEvaluation
 class Radar9531204TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     # rdar://problem/9531204
     def test_expr_commands(self):
         """The evaluating printf(...) after break stop and then up a stack frame."""
diff --git a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
index da2d7b57fd88d..ada647b59eaf7 100644
--- a/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/test/API/commands/expression/radar_9673664/TestExprHelpExamples.py
@@ -11,8 +11,6 @@
 
 @requireExpressionEvaluation
 class Radar9673644TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py b/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
index ba2fcc78aea3b..f08c0dcbda983 100644
--- a/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
+++ b/lldb/test/API/commands/expression/regression-access-function-template-in-record/TestRegressionAccessFunctionTemplateInRecord.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), [])
diff --git a/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py b/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
index aa125253763fd..e1000c7c0bf20 100644
--- a/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
+++ b/lldb/test/API/commands/expression/save_jit_objects/TestSaveJITObjects.py
@@ -22,7 +22,7 @@ def cleanJITFiles(self):
             os.remove(j)
         return
 
-    @expectedFailureAll(oslist=["windows"])
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     def test_save_jit_objects(self):
         self.build()
         os.chdir(self.getBuildDir())
diff --git a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
index 5eb02a8b1d48a..c734033bd6c02 100644
--- a/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
+++ b/lldb/test/API/commands/expression/static-initializers/TestStaticInitializers.py
@@ -5,8 +5,6 @@
 
 
 class StaticInitializers(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(
         archs="aarch64",
         oslist=["freebsd"],
diff --git a/lldb/test/API/commands/expression/test/TestExprs.py b/lldb/test/API/commands/expression/test/TestExprs.py
index b0016e71daf46..65e1e7b9b3e2a 100644
--- a/lldb/test/API/commands/expression/test/TestExprs.py
+++ b/lldb/test/API/commands/expression/test/TestExprs.py
@@ -21,8 +21,6 @@
 
 @requireExpressionEvaluation
 class BasicExprCommandsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/test/TestExprs2.py b/lldb/test/API/commands/expression/test/TestExprs2.py
index be6c071667e54..44a6b374199ee 100644
--- a/lldb/test/API/commands/expression/test/TestExprs2.py
+++ b/lldb/test/API/commands/expression/test/TestExprs2.py
@@ -10,8 +10,6 @@
 
 
 class ExprCommands2TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
index 900ac69b37c3d..bbaa6b8137d1e 100644
--- a/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
+++ b/lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
@@ -10,8 +10,6 @@
 
 
 class TopLevelExpressionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py b/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
index ef9a9b339d4ff..03424658f3ed3 100644
--- a/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
+++ b/lldb/test/API/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), None, test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), None)
diff --git a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
index fde587b0a78e6..05c3e33499737 100644
--- a/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
+++ b/lldb/test/API/commands/expression/unwind_expression/TestUnwindExpression.py
@@ -10,7 +10,6 @@
 
 @requireExpressionEvaluation
 class UnwindFromExpressionTest(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     main_spec = lldb.SBFileSpec("main.cpp", False)
 
     def build_and_run_to_bkpt(self):
diff --git a/lldb/test/API/commands/expression/urem-sign/TestScalarURem.py b/lldb/test/API/commands/expression/urem-sign/TestScalarURem.py
index 03424658f3ed3..3f72ebbbb2a06 100644
--- a/lldb/test/API/commands/expression/urem-sign/TestScalarURem.py
+++ b/lldb/test/API/commands/expression/urem-sign/TestScalarURem.py
@@ -1,4 +1,8 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), None)
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")],
+)
diff --git a/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py b/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
index 3541e9eccccc3..5424d582074db 100644
--- a/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
+++ b/lldb/test/API/commands/expression/xvalue/TestXValuePrinting.py
@@ -6,6 +6,7 @@
 
 @requireExpressionEvaluation
 class ExprXValuePrintingTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """Printing an xvalue should work."""
         self.build()
diff --git a/lldb/test/API/commands/frame/var-dil/expr/Casts/TestFrameVarDILCast.py b/lldb/test/API/commands/frame/var-dil/expr/Casts/TestFrameVarDILCast.py
index 17a083c19a525..3cb7e2f8a917b 100644
--- a/lldb/test/API/commands/frame/var-dil/expr/Casts/TestFrameVarDILCast.py
+++ b/lldb/test/API/commands/frame/var-dil/expr/Casts/TestFrameVarDILCast.py
@@ -13,6 +13,7 @@
 
 
 class TestFrameVarDILCast(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_type_cast(self):
         self.build()
         (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py b/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
index ba2fcc78aea3b..f08c0dcbda983 100644
--- a/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
+++ b/lldb/test/API/commands/frame/var-scope/TestFrameVariableScope.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), [])
diff --git a/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py b/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
index 1f6789420eb30..8db5c545693c4 100644
--- a/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
+++ b/lldb/test/API/commands/frame/var/direct-ivar/cpp/TestFrameVarDirectIvarCpp.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_cpp_this(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py b/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
index 24b4d20d42083..97ca35cb47416 100644
--- a/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
+++ b/lldb/test/API/commands/frame/var/repeat/TestFrameVarRepeat.py
@@ -4,8 +4,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_explicit_depth(self):
         """Test that repeating 'frame variable' increments --depth."""
         self.build()
diff --git a/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py b/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
index 8e882376eb883..112add6dddb61 100644
--- a/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
+++ b/lldb/test/API/commands/process/reverse-continue/TestReverseContinueCommandNotSupported.py
@@ -11,8 +11,6 @@
 
 
 class TestReverseContinueCommandNotSupported(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_reverse_continue_not_supported(self):
         target = self.connect()
 
diff --git a/lldb/test/API/commands/source/info/TestSourceInfo.py b/lldb/test/API/commands/source/info/TestSourceInfo.py
index 0cdd46e00c068..c8308c16011e0 100644
--- a/lldb/test/API/commands/source/info/TestSourceInfo.py
+++ b/lldb/test/API/commands/source/info/TestSourceInfo.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals())
diff --git a/lldb/test/API/commands/target/basic/TestTargetCommand.py b/lldb/test/API/commands/target/basic/TestTargetCommand.py
index 30c52e15c2c73..fcb50effb77fe 100644
--- a/lldb/test/API/commands/target/basic/TestTargetCommand.py
+++ b/lldb/test/API/commands/target/basic/TestTargetCommand.py
@@ -13,7 +13,6 @@
 
 
 class targetCommandTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py b/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
index dd5b07abb3cf4..9872e057cbbfb 100644
--- a/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
+++ b/lldb/test/API/commands/target/modules/lookup/TestImageLookupPCExpression.py
@@ -9,8 +9,6 @@
 
 
 class TestImageLookupPCInC(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_sample_rename_this(self):
         """There can be many tests in a test case - describe this test here."""
         self.build()
diff --git a/lldb/test/API/commands/thread/select/TestThreadSelect.py b/lldb/test/API/commands/thread/select/TestThreadSelect.py
index 3b8214489681a..6d95bac1bdb60 100644
--- a/lldb/test/API/commands/thread/select/TestThreadSelect.py
+++ b/lldb/test/API/commands/thread/select/TestThreadSelect.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_invalid_arg(self):
         self.build()
 
diff --git a/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py b/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
index 7094ee45f50d3..60c0dd0a233bf 100644
--- a/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
+++ b/lldb/test/API/functionalities/alias/TestBtAliasRepeat.py
@@ -4,8 +4,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/alias/TestPAlias.py b/lldb/test/API/functionalities/alias/TestPAlias.py
index 278e06d2c77f3..e1f00b91e0149 100644
--- a/lldb/test/API/functionalities/alias/TestPAlias.py
+++ b/lldb/test/API/functionalities/alias/TestPAlias.py
@@ -4,8 +4,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
index bdcb13e9da903..7b4e553e7cee7 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_file_colon_line/TestBreakpointByFileColonLine.py
@@ -10,8 +10,6 @@
 
 
 class BreakpointByLineAndColumnTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def testBreakpointSpecWithLine(self):
         self.build()
         target = self.createTestTarget()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
index 1f5718149b3e3..56750dac78f3d 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
@@ -12,6 +12,7 @@
 class BreakpointByLineAndColumnTestCase(TestBase):
     ## Skip gcc version less 7.1 since it doesn't support -gcolumn-info
     @skipIf(compiler="gcc", compiler_version=["<", "7.1"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def testBreakpointByLineAndColumn(self):
         self.build()
         src_file = lldb.SBFileSpec("main.cpp")
@@ -27,6 +28,7 @@ def testBreakpointByLineAndColumn(self):
             in_then |= b_loc.GetColumn() == 50
         self.assertTrue(in_then)
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def testBreakpointByLineAndColumnUsingCLI(self):
         self.build()
         src_file = lldb.SBFileSpec("main.cpp")
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index bd0e40d556cd1..930d497032171 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
@@ -10,8 +10,6 @@
 
 
 class RegexpBreakCommandTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_set_version(self):
         """Test _regexp-break command."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index cfc687f6e98d3..7bee800692dcf 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -10,8 +10,6 @@
 # Flaky on buildbot, https://github.com/llvm/llvm-project/issues/206141.
 @skipIf(oslist=["windows"], archs=["aarch64"])
 class BreakpointConditionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_breakpoint_condition_and_run_command(self):
         """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 929ddf18ad030..1a0c0630e8f4e 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -4,11 +4,13 @@
 
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 import lldbsuite.test.lldbutil as lldbutil
 
 
 class BreakpointIDTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py b/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
index c99daf0599c7d..f7a6b0a85d9ed 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
@@ -5,6 +5,7 @@
 
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 import lldbsuite.test.lldbutil as lldbutil
 
@@ -17,6 +18,7 @@ def check_location_file(self, bp, loc, test_name):
         comp_name = comp_unit.GetFileSpec().GetFilename()
         return comp_name == test_name
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_regex_breakpoint_language(self):
         """Test that the name regex breakpoint commands obey the language filter."""
 
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 38b1acea1ef88..65ca990365654 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -10,8 +10,6 @@
 
 
 class BreakpointLocationsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_enable(self):
         """Test breakpoint enable/disable for a breakpoint ID with multiple locations."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
index 87380278dae0a..8bbac51a0c975 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_on_overload/TestBreakOnOverload.py
@@ -10,8 +10,6 @@
 
 
 class TestBreakpointOnOverload(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def check_breakpoint(self, name):
         bkpt = self.target.BreakpointCreateByName(name)
         self.assertEqual(bkpt.num_locations, 1, "Got one location")
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index db96c5b47069d..d262b627195bc 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
@@ -9,8 +9,6 @@
 
 
 class BreakpointOptionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test breakpoint command for different options."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py b/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
index 641e80feb59be..8c4965e9576f9 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_reset_upon_run/TestBreakpointResetUponRun.py
@@ -8,7 +8,6 @@
 
 
 class HitcountResetUponRun(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     BREAKPOINT_TEXT = "Set a breakpoint here"
 
     def check_stopped_at_breakpoint_and_hit_once(self, thread, breakpoint):
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
index 2acc5174e46c3..dac6a8f06c221 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
@@ -8,7 +8,6 @@
 
 
 class BreakpointSetRestart(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     BREAKPOINT_TEXT = "Set a breakpoint here"
 
     @skipIfNetBSD
diff --git a/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py b/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
index 2c308dc6f3ea2..bf9349d570921 100644
--- a/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
+++ b/lldb/test/API/functionalities/breakpoint/default_source_file/TestDefaultSourceFile.py
@@ -5,8 +5,6 @@
 
 
 class DefaultSourceFileTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_default_source_file_is_entry_point(self):
         """The default file for a line breakpoint is main's file, not Foo::main's."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py b/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
index 9086cf4b22652..fb9a764b5170e 100644
--- a/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/delayed_breakpoints/TestDelayedBreakpoint.py
@@ -8,8 +8,6 @@
 @skipIfWindowsAndNoLLDBServer
 @requireNotWasm("iwasm gdb stub lacks the needed packets")
 class TestDelayedBreakpoint(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         self.runCmd("settings set target.process.use-delayed-breakpoints true")
diff --git a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index be3fd2f8a35c7..87c8949b9c399 100644
--- a/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/test/API/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
@@ -9,8 +9,6 @@
 
 
 class BreakpointInDummyTarget(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test breakpoint set before we have a target."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index 087a383188be1..ea3e0b75b4de1 100644
--- a/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -12,8 +12,6 @@
 class InlinedBreakpointsTestCase(TestBase):
     """Bug fixed: rdar://problem/8464339"""
 
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
         self.build()
diff --git a/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py b/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
index 7c9ddecd35026..dc10d407d7230 100644
--- a/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
+++ b/lldb/test/API/functionalities/breakpoint/same_cu_name/TestFileBreakpointsSameCUName.py
@@ -11,8 +11,6 @@
 
 
 class TestBreakpointSameCU(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_breakpoint_same_cu(self):
         self.build()
         target = self.createTestTarget()
diff --git a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
index ffe3e1dc712ce..00bcde39bdfe1 100644
--- a/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
+++ b/lldb/test/API/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
@@ -11,8 +11,6 @@
 
 
 class TestSourceRegexBreakpoints(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_location(self):
         self.build()
         self.source_regex_locations()
diff --git a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
index 9b47b1527e11c..1315288b35c55 100644
--- a/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
@@ -12,8 +12,6 @@
 
 
 class StepOverBreakpointsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
 
diff --git a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
index 4f7c01bce8a4b..1cae52a0f74b1 100644
--- a/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
+++ b/lldb/test/API/functionalities/breakpoint/thread_plan_user_breakpoint/TestThreadPlanUserBreakpoint.py
@@ -16,8 +16,6 @@
 
 
 class ThreadPlanUserBreakpointsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
 
diff --git a/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py b/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
index b67f76dc166ef..ae929fc4d9f5a 100644
--- a/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
+++ b/lldb/test/API/functionalities/breakpoint/update_condition/TestUpdateBreakpointCondition.py
@@ -14,8 +14,6 @@
 
 
 class UpdateBreakpointConditionTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = "main.c"
diff --git a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
index 6df93bb8df078..f023325d12b9c 100644
--- a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
@@ -14,8 +14,6 @@
 
 
 class ConditionalBreakTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @add_test_categories(["pyapi"])
     def test_with_python(self):
         """Exercise some thread and frame APIs to break if c() is called by a()."""
diff --git a/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py b/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
index c32a4517b2b82..d67abcd725eb1 100644
--- a/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/bytecode-summary/TestBytecodeSummary.py
@@ -5,6 +5,7 @@
 
 
 class TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         if self.TraceOn():
diff --git a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
index de79f92794168..21228c61e1427 100644
--- a/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
+++ b/lldb/test/API/functionalities/data-formatter/bytecode-synthetic/TestBytecodeSynthetic.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_synthetic(self):
         self.build()
         if self.TraceOn():
diff --git a/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py b/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
index f570296f8c18a..4c55fa879c677 100644
--- a/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
+++ b/lldb/test/API/functionalities/data-formatter/callback-matching/TestDataFormatterCallbackMatching.py
@@ -9,8 +9,6 @@
 
 
 class PythonSynthDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py b/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
index ed3d3827cf412..d6906a49463ba 100644
--- a/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
+++ b/lldb/test/API/functionalities/data-formatter/custom-printf-summary/TestCustomSummaryLLVMFormat.py
@@ -4,8 +4,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_raw_bytes(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index 30b70de93cfa2..516582de024c1 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
@@ -10,8 +10,6 @@
 
 
 class AdvDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
index a8baf2ac60816..c622aba4f6bc0 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-caching/TestDataFormatterCaching.py
@@ -5,8 +5,6 @@
 
 
 class TestDataFormatterCaching(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """
         Test that hardcoded summary formatter matches aren't improperly cached.
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index d0bb842c67b1e..f659f1edd1fc9 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
@@ -9,8 +9,6 @@
 
 
 class CategoriesDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index d3f8cc85ad916..aa848d4681738 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
@@ -17,6 +17,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test that that file and class static variables display correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index 4fa3d16e6df48..e6aeef2bedff2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
@@ -10,8 +10,6 @@
 
 
 class DataFormatterDisablingTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index cbccc92021868..d2d596eb838db 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
@@ -9,8 +9,6 @@
 
 
 class EnumFormatTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index e8b38b7502f2f..5ff6fd90683b6 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
@@ -10,8 +10,6 @@
 
 
 class GlobalsDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index f50c8d990d7a0..54fb44b10feb7 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
@@ -9,8 +9,6 @@
 
 
 class NamedSummariesDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-matching/TestDataFormatterPtrMatching.py b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-matching/TestDataFormatterPtrMatching.py
index ebefe87e913a3..6dd36555045ec 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-matching/TestDataFormatterPtrMatching.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-matching/TestDataFormatterPtrMatching.py
@@ -16,6 +16,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_summary_with_command(self):
         """Test "type summary add" command line option "--pointer-match-depth"."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 020127c7a66ec..29085db3a4fce 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
@@ -9,8 +9,6 @@
 
 
 class PtrToArrayDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test that LLDB handles the clang typeclass Paren correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index 2025b3b551169..7c8133482db92 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
@@ -9,8 +9,6 @@
 
 
 class PythonSynthDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
index 210592d314c73..50076b7f2f8c1 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
@@ -9,8 +9,6 @@
 
 
 class ScriptDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index e185f34be7cf6..91b249b677c73 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
@@ -10,8 +10,6 @@
 
 
 class SkipSummaryDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index 806e33b6cba6a..10592bc9fb329 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
@@ -10,8 +10,6 @@
 
 
 class SmartArrayDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
index 8694349a3717d..76b8e7b40f440 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic-simulators/invalid-atomic/TestDataFormatterInvalidAtomic.py
@@ -8,8 +8,6 @@
 
 
 class InvalidAtomicDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/atomic/TestDataFormatterStdAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/atomic/TestDataFormatterStdAtomic.py
index 26ed282781f63..5194208a09556 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/atomic/TestDataFormatterStdAtomic.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/atomic/TestDataFormatterStdAtomic.py
@@ -11,7 +11,6 @@
 
 class StdAtomicTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def get_variable(self, name):
         var = self.frame().FindVariable(name)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
index e71dfe589a026..4f367550606a2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/bitset/TestDataFormatterGenericBitset.py
@@ -13,7 +13,6 @@
 
 
 class GenericBitsetDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
index d2924f1de3b57..7dcdf06112b3e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/deque/TestDataFormatterGenericDeque.py
@@ -6,7 +6,6 @@
 
 class GenericDequeDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def findVariable(self, name):
         var = self.frame().FindVariable(name)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/error_code/TestDataFormatterStdErrorCode.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/error_code/TestDataFormatterStdErrorCode.py
index 841084bf45637..8c0f7bce4362d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/error_code/TestDataFormatterStdErrorCode.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/error_code/TestDataFormatterStdErrorCode.py
@@ -10,7 +10,6 @@
 
 class StdErrorCodeTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def check_value(self, name, summary):
         self.expect_var_path(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/expected/TestDataFormatterStdExpected.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/expected/TestDataFormatterStdExpected.py
index c465f8998d6c4..22f93c82045a2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/expected/TestDataFormatterStdExpected.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/expected/TestDataFormatterStdExpected.py
@@ -8,7 +8,6 @@
 
 class StdExpectedDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     @add_test_categories(["msvcstl"])
     def test_msvcstl(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
index a3dcce90b74e9..b3f77b4ccceff 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/forward_list/TestDataFormatterGenericForwardList.py
@@ -10,7 +10,6 @@
 
 class TestDataFormatterGenericForwardList(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
index f284c946f8fa2..56874a9dda500 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/iterator/TestDataFormatterStdIterator.py
@@ -9,7 +9,6 @@
 
 
 class StdIteratorDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
index 1be1bfc3fc19d..d290b0deb8a2f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/TestDataFormatterGenericList.py
@@ -11,7 +11,6 @@
 
 class GenericListDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         # Call super's setUp().
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
index 033246deb0faa..14d9f0c21ab0a 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/list/loop/TestDataFormatterGenericListLoop.py
@@ -12,7 +12,6 @@
 
 class GenericListDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
     NO_DEBUG_INFO_TESTCASE = True
 
     def do_test_with_run_command(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/TestDataFormatterStdMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/TestDataFormatterStdMap.py
index 2a420d8ed58ae..6d0fb04b0f9ec 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/TestDataFormatterStdMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/map/TestDataFormatterStdMap.py
@@ -9,7 +9,6 @@
 
 
 class StdMapDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
index 0486956ade630..c99fa56af7c4d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multimap/TestDataFormatterGenericMultiMap.py
@@ -12,7 +12,6 @@
 
 class GenericMultiMapDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
index d5cd57cafea6e..12a2854d4d09d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/multiset/TestDataFormatterGenericMultiSet.py
@@ -11,7 +11,6 @@
 
 class GenericMultiSetDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
index 570be8b689a37..836b9bd08098d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/optional/TestDataFormatterGenericOptional.py
@@ -5,7 +5,6 @@
 
 
 class GenericOptionalDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test_with_run_command(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/ordering/TestDataFormatterStdOrdering.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/ordering/TestDataFormatterStdOrdering.py
index 03cae6531e72a..27c7947c3499d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/ordering/TestDataFormatterStdOrdering.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/ordering/TestDataFormatterStdOrdering.py
@@ -10,7 +10,6 @@
 
 class StdOrderingTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def do_test(self):
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/path/TestDataFormatterStdPath.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/path/TestDataFormatterStdPath.py
index f5708856507c2..65bd8ccde1e39 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/path/TestDataFormatterStdPath.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/path/TestDataFormatterStdPath.py
@@ -8,7 +8,6 @@
 
 class StdPathTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def do_test(self):
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
index b8d4712ea2d99..166ed83220d2b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/queue/TestDataFormatterStdQueue.py
@@ -9,7 +9,6 @@
 
 
 class TestDataFormatterStdQueue(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
index 3063d23b9d9ef..3b3bf081e0b80 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/set/TestDataFormatterGenericSet.py
@@ -11,7 +11,6 @@
 
 class GenericSetDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/shared_ptr/TestDataFormatterStdSharedPtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/shared_ptr/TestDataFormatterStdSharedPtr.py
index c0cd39a2aee3c..a91439fcbee6f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/shared_ptr/TestDataFormatterStdSharedPtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/shared_ptr/TestDataFormatterStdSharedPtr.py
@@ -9,7 +9,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py
index f648567e07f3b..e7acdd33d0cd4 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/source_location/TestDataFormatterStdSourceLocation.py
@@ -10,7 +10,6 @@
 
 class StdSourceLocationTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def do_test(self):
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/span/TestDataFormatterStdSpan.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/span/TestDataFormatterStdSpan.py
index ada4627722490..4bd4bb12e8338 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/span/TestDataFormatterStdSpan.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/span/TestDataFormatterStdSpan.py
@@ -9,7 +9,6 @@
 
 
 class StdSpanDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def findVariable(self, name):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string/TestDataFormatterStdString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string/TestDataFormatterStdString.py
index fbc8e59413e6c..b8d2d9a4f4c16 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string/TestDataFormatterStdString.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string/TestDataFormatterStdString.py
@@ -11,7 +11,6 @@
 
 
 class StdStringDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string_view/TestDataFormatterStdStringView.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string_view/TestDataFormatterStdStringView.py
index ea924a0a27908..ed3ecd0b0b91c 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string_view/TestDataFormatterStdStringView.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string_view/TestDataFormatterStdStringView.py
@@ -11,7 +11,6 @@
 
 
 class StdStringViewDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/TestDataFormatterStdTuple.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/TestDataFormatterStdTuple.py
index 5cf409c4b0c2c..5db255316c2d6 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/TestDataFormatterStdTuple.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/tuple/TestDataFormatterStdTuple.py
@@ -10,7 +10,6 @@
 
 class TestDataFormatterStdTuple(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def setUp(self):
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string/TestDataFormatterStdU8String.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string/TestDataFormatterStdU8String.py
index 9dd9ae403e16e..2bc975852cded 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string/TestDataFormatterStdU8String.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string/TestDataFormatterStdU8String.py
@@ -11,7 +11,6 @@
 
 
 class StdU8StringDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string_view/TestDataFormatterStdU8StringView.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string_view/TestDataFormatterStdU8StringView.py
index 50bb98b82716d..05f88b2060e6d 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string_view/TestDataFormatterStdU8StringView.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/u8string_view/TestDataFormatterStdU8StringView.py
@@ -11,7 +11,6 @@
 
 
 class StdU8StringViewDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unique_ptr/TestDataFormatterStdUniquePtr.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unique_ptr/TestDataFormatterStdUniquePtr.py
index a6d016070b114..24ec4d841baeb 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unique_ptr/TestDataFormatterStdUniquePtr.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unique_ptr/TestDataFormatterStdUniquePtr.py
@@ -9,7 +9,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
index a1ab330b4cf34..738cd3b7e8af2 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/unordered/TestDataFormatterGenericUnordered.py
@@ -4,7 +4,6 @@
 
 
 class GenericUnorderedDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py
index fd12d8abed2fd..376993173fc95 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/valarray/TestDataFormatterStdValarray.py
@@ -10,7 +10,6 @@
 
 class StdValarrayDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def check_valarray(self, process, bkpt):
         #
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/variant/TestDataFormatterStdVariant.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/variant/TestDataFormatterStdVariant.py
index c1b0bacbe4ca7..20213274cd908 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/variant/TestDataFormatterStdVariant.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/variant/TestDataFormatterStdVariant.py
@@ -9,7 +9,6 @@
 
 
 class StdVariantDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vbool/TestDataFormatterStdVBool.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vbool/TestDataFormatterStdVBool.py
index 01d5cdbaefd8a..e7b2d0e954516 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vbool/TestDataFormatterStdVBool.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vbool/TestDataFormatterStdVBool.py
@@ -10,7 +10,6 @@
 
 class StdVBoolDataFormatterTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def do_test(self):
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vector/TestDataFormatterStdVector.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vector/TestDataFormatterStdVector.py
index d589bdb6ecbfc..3f59af890c440 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vector/TestDataFormatterStdVector.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/vector/TestDataFormatterStdVector.py
@@ -9,7 +9,6 @@
 
 
 class StdVectorDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def check_numbers(self, var_name, show_ptr=False):
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index ec2db8303c76b..2c475d2626a1f 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
@@ -9,8 +9,6 @@
 
 
 class SynthDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
index d6f2f917e92ea..0aeeb7db3e270 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
@@ -10,8 +10,6 @@
 
 
 class DataFormatterSynthTypeTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index d9fb188b1b34f..a29fad0fca3c5 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class DataFormatterSynthValueTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index f1cf7f26ffc9a..a13ca0eae8315 100644
--- a/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/test/API/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
@@ -9,8 +9,6 @@
 
 
 class FormatPropagationTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index b13b361218deb..265880d683079 100644
--- a/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/test/API/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
@@ -9,8 +9,6 @@
 
 
 class FrameFormatSmallStructTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index e0dde6c2ebf47..c8d0b093a0203 100644
--- a/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/test/API/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
@@ -9,8 +9,6 @@
 
 
 class DataFormatterHexCapsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
index 155408c1b8a4c..79260f69634d3 100644
--- a/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
+++ b/lldb/test/API/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
@@ -9,8 +9,6 @@
 
 
 class LanguageCategoryUpdatesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
index 7890a265c4b78..d5c933e3add53 100644
--- a/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
+++ b/lldb/test/API/functionalities/data-formatter/parray/TestPrintArray.py
@@ -10,8 +10,6 @@
 
 
 class PrintArrayTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_print_array(self):
         """Test that expr -Z works"""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
index f70162bf28583..7a4f1bb4d8ecc 100644
--- a/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
+++ b/lldb/test/API/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
@@ -4,6 +4,7 @@
 
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 import lldbsuite.test.lldbutil as lldbutil
 
@@ -15,6 +16,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set breakpoint here")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test that a pointer/reference to a typedef is formatted as we want."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index 9bedd775cdc52..cd839752a7a42 100644
--- a/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/test/API/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
@@ -9,8 +9,6 @@
 
 
 class DataFormatterRefPtrRecursionTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py b/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
index 7b6ff6e728a69..7c366445b1c6e 100644
--- a/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
+++ b/lldb/test/API/functionalities/data-formatter/root-reference-children/TestRootReferenceChildren.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/special-chars/TestSummaryStringSpecialChars.py b/lldb/test/API/functionalities/data-formatter/special-chars/TestSummaryStringSpecialChars.py
index d2ee48dbb6bc7..982aae4001f50 100644
--- a/lldb/test/API/functionalities/data-formatter/special-chars/TestSummaryStringSpecialChars.py
+++ b/lldb/test/API/functionalities/data-formatter/special-chars/TestSummaryStringSpecialChars.py
@@ -5,12 +5,14 @@
 
 
 class TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_summary_string_with_bare_dollar_char(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.c"))
         self.runCmd("type summary add --summary-string '$ $CASH $' --no-value Dollars")
         self.expect("v cash", startstr="(Dollars) cash = $ $CASH $")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_summary_string_with_bare_dollar_char_before_var(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "break here", lldb.SBFileSpec("main.c"))
diff --git a/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py b/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
index 4fdffea9d9a8f..2a91b455b3c2a 100644
--- a/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
+++ b/lldb/test/API/functionalities/data-formatter/stringprinter/TestStringPrinter.py
@@ -4,8 +4,6 @@
 
 
 class TestStringPrinter(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
index bf6f6455c8c1e..5096283908622 100644
--- a/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
+++ b/lldb/test/API/functionalities/data-formatter/summary-string-onfail/TestSummaryStringOnFail.py
@@ -9,8 +9,6 @@
 
 
 class SummaryStringOnFailDataFormatterTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py b/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
index 689fa13f1d8ce..4cada6efcca85 100644
--- a/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
+++ b/lldb/test/API/functionalities/data-formatter/synth_oneline_summaries/TestSyntheticOneLineSummaries.py
@@ -5,8 +5,6 @@
 
 
 class SyntheticOneLineSummariesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that the presence of a synthetic child provider doesn't prevent one-line-summaries."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index e3bf36e3ecd90..e7711a8952e67 100644
--- a/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/test/API/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
@@ -10,8 +10,6 @@
 
 
 class SyntheticCappingTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py b/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
index 7dd3479869f71..be34b0f1f72d8 100644
--- a/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
+++ b/lldb/test/API/functionalities/data-formatter/synthetic_subscript/TestSyntheticSubscript.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         _, process, _, _ = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py b/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
index c76b31df8ce54..ca56432841284 100644
--- a/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
+++ b/lldb/test/API/functionalities/data-formatter/type-synth-wants-deref/TestTypeSynthRequiresDeref.py
@@ -9,8 +9,6 @@
 
 
 class TypeSynthRequiresDerefTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.addTearDownHook(lambda: self.runCmd("type synth clear", check=False))
diff --git a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
index 5598bf6795f4b..bfc07d26ddc5a 100644
--- a/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
+++ b/lldb/test/API/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
@@ -10,8 +10,6 @@
 
 
 class TypeSummaryListScriptTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_typesummarylist_script(self):
         """Test data formatter commands."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py b/lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py
index f08c0dcbda983..3f72ebbbb2a06 100644
--- a/lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py
+++ b/lldb/test/API/functionalities/data-formatter/typedef_array/TestTypedefArray.py
@@ -1,4 +1,8 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [])
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")],
+)
diff --git a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index 17296ab8e1acd..0941465c87d0d 100644
--- a/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/test/API/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
@@ -9,8 +9,6 @@
 
 
 class UserFormatVSSummaryTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index 05d290cd7a364..12196f5dca3c4 100644
--- a/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
+++ b/lldb/test/API/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
@@ -4,6 +4,7 @@
 
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 import lldbsuite.test.lldbutil as lldbutil
 
@@ -15,6 +16,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test that that file and class static variables display correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
index 73923dc0305c6..8ffe6eb8730b8 100644
--- a/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
@@ -16,6 +16,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", " // Set breakpoint here.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test using Python synthetic children provider."""
         self.build()
diff --git a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index 1839c28aeb29f..c4f474091a6b1 100644
--- a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -17,6 +17,7 @@ def setUp(self):
 
     # rdar://problem/14035604
     @skipIf(compiler="gcc")  # gcc don't have ext_vector_type extension
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Check that vector types format properly"""
         self.build()
diff --git a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
index 8d9e00691e5d3..ef3b00d75b599 100644
--- a/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/test/API/functionalities/dead-strip/TestDeadStrip.py
@@ -10,8 +10,6 @@
 
 
 class DeadStripTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test breakpoint works correctly with dead-code stripping."""
         self.build()
diff --git a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
index 608ccd8375c1e..3f1760e76dde2 100644
--- a/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
+++ b/lldb/test/API/functionalities/find-line-entry/TestFindLineEntry.py
@@ -8,8 +8,6 @@
 
 
 class FindLineEntry(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_compile_unit_find_line_entry_index(self):
         """Test the CompileUnit LineEntryIndex lookup API"""
         self.build()
diff --git a/lldb/test/API/functionalities/float-display/TestFloatDisplay.py b/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
index ba2fcc78aea3b..f08c0dcbda983 100644
--- a/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
+++ b/lldb/test/API/functionalities/float-display/TestFloatDisplay.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [], test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), [])
diff --git a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
index 835358f068509..32551056976ce 100644
--- a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
@@ -11,6 +11,7 @@
 class AssertingInferiorTestCase(TestBase):
     @expectedFailureAll(
         oslist=["windows"],
+        debug_info=no_match(["pdb"]),
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
     @expectedFailureAll(oslist=["linux"], archs=["arm$"], bugnumber="llvm.org/pr25338")
@@ -22,6 +23,7 @@ def test_inferior_asserting(self):
 
     @expectedFailureAll(
         oslist=["windows"],
+        debug_info=no_match(["pdb"]),
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
     @expectedFailureAndroid(api_levels=list(range(16 + 1)))  # b.android.com/179836
@@ -32,6 +34,7 @@ def test_inferior_asserting_register(self):
 
     @expectedFailureAll(
         oslist=["windows"],
+        debug_info=no_match(["pdb"]),
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
     @expectedFailureAll(
@@ -58,6 +61,7 @@ def test_inferior_asserting_python(self):
 
     @expectedFailureAll(
         oslist=["windows"],
+        debug_info=no_match(["pdb"]),
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
     @expectedFailureAll(
@@ -74,6 +78,7 @@ def test_inferior_asserting_expr(self):
 
     @expectedFailureAll(
         oslist=["windows"],
+        debug_info=no_match(["pdb"]),
         bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows",
     )
     @expectedFailureAll(
diff --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
index ee779a9e1b0b8..dfd311c766349 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashing.py
@@ -10,8 +10,6 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingInferiorTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
index 967b9d3916c3e..248830c7ccac5 100644
--- a/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/TestInferiorCrashingStep.py
@@ -10,8 +10,6 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingInferiorStepTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 8e1b964f981db..89f605510918b 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
@@ -10,8 +10,6 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingRecursiveInferiorTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @expectedFailureNetBSD
     def test_recursive_inferior_crashing(self):
diff --git a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
index 9dceb4bf93cb7..99d03c257801d 100644
--- a/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
+++ b/lldb/test/API/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferiorStep.py
@@ -10,8 +10,6 @@
 
 @requireNotWasm("wasm has no memory-protection faults/signals")
 class CrashingRecursiveInferiorStepTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_recursive_inferior_crashing_step(self):
         """Test that stepping after a crash behaves correctly."""
         self.build()
diff --git a/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py b/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
index b5899bf9f264d..ee796f9252bdf 100644
--- a/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
+++ b/lldb/test/API/functionalities/inline-stepping/TestInlineStepping.py
@@ -13,6 +13,7 @@ class TestInlineStepping(TestBase):
         compiler="icc",
         bugnumber="# Not really a bug.  ICC combines two inlined functions.",
     )
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_python_api(self):
         """Test stepping over and into inlined functions."""
         self.build()
@@ -20,13 +21,16 @@ def test_with_python_api(self):
 
     @add_test_categories(["pyapi"])
     @skipIf(oslist=["windows"], archs=["aarch64"])  # Flaky on buildbot
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_step_over_with_python_api(self):
         """Test stepping over and into inlined functions."""
         self.build()
         self.inline_stepping_step_over()
 
     @add_test_categories(["pyapi"])
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr32343"
+    )
     def test_step_in_template_with_python_api(self):
         """Test stepping in to templated functions."""
         self.build()
diff --git a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index 786ab45f0ce4d..98c0b149003df 100644
--- a/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/test/API/functionalities/jitloader_gdb/TestJITLoaderGDB.py
@@ -10,8 +10,6 @@
 
 
 class JITLoaderGDBTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipTestIfFn(
         lambda: "Skipped because the test crashes the test runner",
         bugnumber="llvm.org/pr24702",
diff --git a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
index 63e981016a1cb..3a58296b70cd2 100644
--- a/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
+++ b/lldb/test/API/functionalities/location-list-lookup/TestLocationListLookup.py
@@ -7,8 +7,6 @@
 
 
 class LocationListLookupTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def launch(self) -> lldb.SBProcess:
         exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
diff --git a/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py b/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
index 5f3cb7a06fef9..1bc227dfce9be 100644
--- a/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
+++ b/lldb/test/API/functionalities/memory/big-read/TestMemoryReadMaximumSize.py
@@ -9,8 +9,6 @@
 
 
 class TestMemoryReadMaximumSize(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_memory_read_max_setting(self):
         """Test the target.max-memory-read-size setting."""
         self.build()
diff --git a/lldb/test/API/functionalities/memory/find/TestMemoryFind.py b/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
index 7d8bd6be8a656..7876f13cf9589 100644
--- a/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
+++ b/lldb/test/API/functionalities/memory/find/TestMemoryFind.py
@@ -17,6 +17,7 @@ def setUp(self):
         self.line = line_number("main.cpp", "// break here")
 
     @requireExpressionEvaluation  # (memory find calls strlen())
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_memory_find(self):
         """Test the 'memory find' command."""
         self.build()
diff --git a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index 60c7f0da5c22a..4efd3b72b44c2 100644
--- a/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/test/API/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
@@ -8,8 +8,6 @@
 
 
 class NonOverlappingIndexVariableCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.source = "main.cpp"
diff --git a/lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py b/lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py
index c8308c16011e0..3f72ebbbb2a06 100644
--- a/lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py
+++ b/lldb/test/API/functionalities/optimized_code/TestNoASanExceptionAfterEvalOP_piece.py
@@ -1,4 +1,8 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals())
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [decorators.expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")],
+)
diff --git a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
index 174748232e92e..9d8c8b778827c 100644
--- a/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
+++ b/lldb/test/API/functionalities/pointer_num_children/TestPointerNumChildren.py
@@ -9,8 +9,6 @@
 
 
 class TestPointerNumChilden(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_pointer_num_children(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
index d74d5720368c0..acd299f4e179b 100644
--- a/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
+++ b/lldb/test/API/functionalities/process_crash_info/TestProcessCrashInfo.py
@@ -12,8 +12,6 @@
 
 
 class PlatformProcessCrashInfoTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.runCmd("settings set auto-confirm true")
diff --git a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
index 5aa1e11cd921a..d006c489b068d 100644
--- a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
+++ b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
@@ -12,8 +12,6 @@
 
 
 class ProcessSaveCoreTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIfRemote
     @skipUnlessWindows
     def test_cannot_save_core_unless_process_stopped(self):
diff --git a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
index eed15bdce8f86..583e187cb6d3a 100644
--- a/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
+++ b/lldb/test/API/functionalities/progress_reporting/TestProgressReporting.py
@@ -9,8 +9,6 @@
 
 
 class TestProgressReporting(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.broadcaster = self.dbg.GetBroadcaster()
diff --git a/lldb/test/API/functionalities/rerun/TestRerun.py b/lldb/test/API/functionalities/rerun/TestRerun.py
index de12819ef31a5..0c74b71498244 100644
--- a/lldb/test/API/functionalities/rerun/TestRerun.py
+++ b/lldb/test/API/functionalities/rerun/TestRerun.py
@@ -10,8 +10,6 @@
 
 
 class TestRerun(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         exe = self.getBuildArtifact("a.out")
diff --git a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index cf40cba4927b7..2894dbcfd25d8 100644
--- a/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/test/API/functionalities/step-avoids-no-debug/TestStepNoDebug.py
@@ -10,8 +10,6 @@
 
 
 class StepAvoidsNoDebugTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @add_test_categories(["pyapi"])
     @expectedFailureAll(
         archs=["aarch64"], oslist=["windows"], bugnumber="llvm.org/pr56292"
diff --git a/lldb/test/API/functionalities/target_var/TestTargetVar.py b/lldb/test/API/functionalities/target_var/TestTargetVar.py
index 0aa09b5856a71..f82e4ca8be6ce 100644
--- a/lldb/test/API/functionalities/target_var/TestTargetVar.py
+++ b/lldb/test/API/functionalities/target_var/TestTargetVar.py
@@ -14,6 +14,7 @@ class targetCommandTestCase(TestBase):
     @skipIfDarwinEmbedded  # needs x86_64
     @skipIf(debug_info="gmodules")  # not relevant
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def testTargetVarExpr(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "main")
diff --git a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index e44e9957eb058..897ec8eae8cf5 100644
--- a/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/test/API/functionalities/thread/break_after_join/TestBreakAfterJoin.py
@@ -11,8 +11,6 @@
 
 @requireThreadSupport
 class BreakpointAfterJoinTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index 1d7e14c7a9b94..e2abc64f51413 100644
--- a/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/test/API/functionalities/thread/crash_during_step/TestCrashDuringStep.py
@@ -10,8 +10,6 @@
 
 
 class CrashDuringStepTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.breakpoint = line_number("main.cpp", "// Set breakpoint here")
diff --git a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index c9435d5d6c20c..f9947abb65457 100644
--- a/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/test/API/functionalities/thread/exit_during_break/TestExitDuringBreak.py
@@ -11,8 +11,6 @@
 
 @requireThreadSupport
 class ExitDuringBreakpointTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
index 3d6c4b1cf3c0b..6ad2266a64c2f 100644
--- a/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/test/API/functionalities/thread/jump/TestThreadJump.py
@@ -11,8 +11,6 @@
 
 @skipIfWasm  # Wasm has no writable PC to jump
 class ThreadJumpTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.build()
diff --git a/lldb/test/API/functionalities/thread/state/TestThreadStates.py b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
index 5c164a5723466..e46795debd502 100644
--- a/lldb/test/API/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/test/API/functionalities/thread/state/TestThreadStates.py
@@ -11,8 +11,6 @@
 
 
 class ThreadStateTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_state_after_breakpoint(self):
         """Test thread state after breakpoint."""
         self.build()
diff --git a/lldb/test/API/functionalities/thread/step_out_line0/TestThreadStepOutLine0.py b/lldb/test/API/functionalities/thread/step_out_line0/TestThreadStepOutLine0.py
index 2707ca852f662..2ea792f2a51e0 100644
--- a/lldb/test/API/functionalities/thread/step_out_line0/TestThreadStepOutLine0.py
+++ b/lldb/test/API/functionalities/thread/step_out_line0/TestThreadStepOutLine0.py
@@ -11,6 +11,7 @@
 
 
 class ThreadStepOutLine0TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         target, process, thread, _ = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
index c856dc0671297..5b3f6b449efbc 100644
--- a/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
+++ b/lldb/test/API/functionalities/thread/step_until/TestStepUntil.py
@@ -7,7 +7,6 @@
 
 
 class StepUntilTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py b/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
index 57f603cd307fe..b1c5659a324a4 100644
--- a/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
+++ b/lldb/test/API/functionalities/type_find_first/TestFindFirstType.py
@@ -8,8 +8,6 @@
 
 
 class TypeFindFirstTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_find_first_type(self):
         """
         Test SBTarget::FindFirstType() and SBModule::FindFirstType() APIs.
diff --git a/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py b/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
index be798df689386..9ddc31c5a55ca 100644
--- a/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
+++ b/lldb/test/API/functionalities/type_get_module/TestTypeGetModule.py
@@ -58,6 +58,7 @@ def find_type(self, type_list, name):
         self.assertTrue(result.IsValid())
         return result
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         target = lldbutil.run_to_breakpoint_make_target(self)
diff --git a/lldb/test/API/functionalities/type_types/TestFindTypes.py b/lldb/test/API/functionalities/type_types/TestFindTypes.py
index 42b5c4cfaaf77..19b063906be24 100644
--- a/lldb/test/API/functionalities/type_types/TestFindTypes.py
+++ b/lldb/test/API/functionalities/type_types/TestFindTypes.py
@@ -3,11 +3,13 @@
 """
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TypeFindFirstTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_find_first_type(self):
         """
         Test SBTarget::FindTypes() and SBModule::FindTypes() APIs.
diff --git a/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py b/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
index a94d95d398c68..3bdd20a850eba 100644
--- a/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
+++ b/lldb/test/API/functionalities/unused-inlined-parameters/TestUnusedInlinedParameters.py
@@ -3,11 +3,13 @@
 """
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestUnusedInlinedParameters(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_unused_inlined_parameters(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
index 3e89c093dd416..d660844405e13 100644
--- a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
+++ b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
@@ -28,8 +28,6 @@
 
 
 class ZerothFrame(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """
         Test that line information is recalculated properly for a frame when it moves
diff --git a/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py b/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
index c1fb4b5568aa4..8a114005c493b 100644
--- a/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
+++ b/lldb/test/API/functionalities/valobj_errors/TestValueObjectErrors.py
@@ -5,8 +5,6 @@
 
 
 class ValueObjectErrorsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that the error message for a missing type
         is visible when printing an object"""
diff --git a/lldb/test/API/lang/c/anonymous/TestAnonymous.py b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
index fa4f1664b0a38..5f3089983bb1b 100644
--- a/lldb/test/API/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/test/API/lang/c/anonymous/TestAnonymous.py
@@ -8,8 +8,6 @@
 
 
 class AnonymousTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIf(
         compiler="icc",
         bugnumber="llvm.org/pr15036: LLDB generates an incorrect AST layout for an anonymous struct when DWARF is generated by ICC",
diff --git a/lldb/test/API/lang/c/array_types/TestArrayTypes.py b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
index 5138c0ceb0e29..fc234f5842508 100644
--- a/lldb/test/API/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/test/API/lang/c/array_types/TestArrayTypes.py
@@ -8,8 +8,6 @@
 
 
 class ArrayTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/enum_types/TestEnumTypes.py b/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
index 225f3b876e3e5..f26014c876a87 100644
--- a/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/test/API/lang/c/enum_types/TestEnumTypes.py
@@ -15,6 +15,7 @@ def setUp(self):
         self.line = line_number("main.c", "// Set break point at this line.")
 
     @requireExpressionEvaluation
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_command_line(self):
         """Test 'image lookup -t enum_test_days' and check for correct display and enum value printing."""
         self.build()
diff --git a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
index 02ea07335f935..0cb8ac5056e29 100644
--- a/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/test/API/lang/c/forward/TestForwardDeclaration.py
@@ -8,7 +8,6 @@
 
 
 class ForwardDeclarationTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, dictionary=None):
diff --git a/lldb/test/API/lang/c/fpeval/TestFPEval.py b/lldb/test/API/lang/c/fpeval/TestFPEval.py
index da0487de869ce..0a953d2d66bf2 100644
--- a/lldb/test/API/lang/c/fpeval/TestFPEval.py
+++ b/lldb/test/API/lang/c/fpeval/TestFPEval.py
@@ -8,8 +8,6 @@
 
 @requireExpressionEvaluation
 class FPEvalTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
index 424854398667a..c3b91beed55f4 100644
--- a/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/test/API/lang/c/function_types/TestFunctionTypes.py
@@ -9,8 +9,6 @@
 
 @requireExpressionEvaluation
 class FunctionTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py b/lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py
index 0deeeba56254e..b20db9afb6bed 100644
--- a/lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py
+++ b/lldb/test/API/lang/c/inlines/TestRedefinitionsInInlines.py
@@ -10,6 +10,7 @@ class TestRedefinitionsInInlines(TestBase):
     # https://github.com/llvm/llvm-project/issues/28219
     @skipIf(compiler="clang", compiler_version=["<", "3.5"])
     @skipIfWasm  # no expression evaluation
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.source = "main.c"
         self.build()
diff --git a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
index 57a419bcd1903..930999834999a 100644
--- a/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
+++ b/lldb/test/API/lang/c/local_variables/TestLocalVariables.py
@@ -12,8 +12,6 @@
 
 
 class LocalVariablesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py b/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
index 149aa8aa8724e..6f7ef247b063a 100644
--- a/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
+++ b/lldb/test/API/lang/c/non-mangled/TestCNonMangled.py
@@ -3,8 +3,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_functions_having_dlang_mangling_prefix(self):
         """
         Ensure C functions with a '_D' prefix alone are not mistakenly treated
diff --git a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
index 62dca58985edd..bcdd590e00d0a 100644
--- a/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/test/API/lang/c/register_variables/TestRegisterVariables.py
@@ -13,8 +13,6 @@ def re_expr_equals(val_type, val):
 
 
 class RegisterVariableTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(compiler="clang", compiler_version=["<", "3.5"])
     @expectedFailureAll(
         compiler="gcc", compiler_version=[">=", "4.8.2"], archs=["i386"]
diff --git a/lldb/test/API/lang/c/set_values/TestSetValues.py b/lldb/test/API/lang/c/set_values/TestSetValues.py
index 822bbd68dc92c..36ac7e5818d83 100644
--- a/lldb/test/API/lang/c/set_values/TestSetValues.py
+++ b/lldb/test/API/lang/c/set_values/TestSetValues.py
@@ -19,6 +19,7 @@ def setUp(self):
         self.line4 = line_number("main.c", "// Set break point #4.")
         self.line5 = line_number("main.c", "// Set break point #5.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """Test settings and readings of program variables."""
         self.build()
diff --git a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
index 5e1c63fc22791..e9c979c1a2ec5 100644
--- a/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/test/API/lang/c/shared_lib/TestSharedLib.py
@@ -10,8 +10,6 @@
 
 @skipIfTargetDoesNotSupportSharedLibraries()
 class SharedLibTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def common_test_expr(self, preload_symbols):
         if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion():
             self.skipTest(
diff --git a/lldb/test/API/lang/c/sizeof/TestCSizeof.py b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
index 1e294356fc044..9b15c19f8dcf3 100644
--- a/lldb/test/API/lang/c/sizeof/TestCSizeof.py
+++ b/lldb/test/API/lang/c/sizeof/TestCSizeof.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/lang/c/step-target/TestStepTarget.py b/lldb/test/API/lang/c/step-target/TestStepTarget.py
index 3aab10cf285ed..e53c13d431e74 100644
--- a/lldb/test/API/lang/c/step-target/TestStepTarget.py
+++ b/lldb/test/API/lang/c/step-target/TestStepTarget.py
@@ -27,7 +27,9 @@ def get_to_start(self):
 
         return thread
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr32343"
+    )
     def test_with_end_line(self):
         """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
 
@@ -39,7 +41,9 @@ def test_with_end_line(self):
 
         self.assertEqual(frame.name, "lotsOfArgs", "Stepped to lotsOfArgs.")
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr32343"
+    )
     def test_with_end_line_bad_name(self):
         """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
 
@@ -62,7 +66,9 @@ def test_with_end_line_deeper(self):
         frame = thread.frames[0]
         self.assertEqual(frame.name, "modifyInt", "Stepped to modifyInt.")
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr32343"
+    )
     def test_with_command_and_block(self):
         """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
         self.do_command_and_block()
@@ -79,7 +85,9 @@ def do_command_and_block(self, use_regexp_step=False):
         frame = thread.frames[0]
         self.assertEqual(frame.name, "lotsOfArgs", "Stepped to lotsOfArgs.")
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr32343"
+    )
     def test_with_command_and_block_and_bad_name(self):
         """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
         self.do_with_command_and_block_and_bad_name()
diff --git a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
index d38a13002b1e2..2e0f8dcc041c2 100644
--- a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
+++ b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
@@ -10,8 +10,6 @@
 
 @requireThreadSupport
 class StepOverDoesntDeadlockTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_step_over(self):
         """Test that when step over steps over a function it lets other threads run."""
         self.build()
diff --git a/lldb/test/API/lang/c/stepping/TestThreadStepping.py b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
index 64a936658ac1f..f577cb62e715e 100644
--- a/lldb/test/API/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/test/API/lang/c/stepping/TestThreadStepping.py
@@ -9,8 +9,6 @@
 
 
 class ThreadSteppingTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/c/strings/TestCStrings.py b/lldb/test/API/lang/c/strings/TestCStrings.py
index c6ea0d864e615..1198689c6b981 100644
--- a/lldb/test/API/lang/c/strings/TestCStrings.py
+++ b/lldb/test/API/lang/c/strings/TestCStrings.py
@@ -9,8 +9,6 @@
 
 @requireExpressionEvaluation
 class CStringsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Tests that C strings work as expected in expressions"""
         self.build()
diff --git a/lldb/test/API/lang/c/struct_types/TestStructTypes.py b/lldb/test/API/lang/c/struct_types/TestStructTypes.py
index f0b5ba278f79f..3679ccc938dc5 100644
--- a/lldb/test/API/lang/c/struct_types/TestStructTypes.py
+++ b/lldb/test/API/lang/c/struct_types/TestStructTypes.py
@@ -1,4 +1,13 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.requireExpressionEvaluation])
+lldbinline.MakeInlineTest(
+    __file__,
+    globals(),
+    [
+        decorators.requireExpressionEvaluation,
+        decorators.expectedFailureAll(
+            debug_info=["pdb"], bugnumber="llvm.org/pr149498"
+        ),
+    ],
+)
diff --git a/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py b/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
index 912c7101ec849..1d9eda6381981 100644
--- a/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
+++ b/lldb/test/API/lang/c/unicode/TestUnicodeSymbols.py
@@ -7,6 +7,7 @@
 
 class TestUnicodeSymbols(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_union_members(self):
         self.build()
         spec = lldb.SBModuleSpec()
diff --git a/lldb/test/API/lang/c/unions/TestUnionMembers.py b/lldb/test/API/lang/c/unions/TestUnionMembers.py
index 2c8487b00a983..263f76a313ecf 100644
--- a/lldb/test/API/lang/c/unions/TestUnionMembers.py
+++ b/lldb/test/API/lang/c/unions/TestUnionMembers.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/lang/c/vla/TestVLA.py b/lldb/test/API/lang/c/vla/TestVLA.py
index ff4da0ee75740..83a4056510e22 100644
--- a/lldb/test/API/lang/c/vla/TestVLA.py
+++ b/lldb/test/API/lang/c/vla/TestVLA.py
@@ -6,6 +6,7 @@
 
 class TestVLA(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "8.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_variable_list(self):
         self.build()
         _, process, _, _ = lldbutil.run_to_source_breakpoint(
@@ -25,6 +26,7 @@ def test_variable_list(self):
             self.assertNotIn("vla_expr", value.name)
 
     @decorators.skipIf(compiler="clang", compiler_version=["<", "8.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_vla(self):
         self.build()
         _, process, _, _ = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/abi_tag_structors/TestAbiTagStructors.py b/lldb/test/API/lang/cpp/abi_tag_structors/TestAbiTagStructors.py
index d58b0ea543847..d196ca3b1520e 100644
--- a/lldb/test/API/lang/cpp/abi_tag_structors/TestAbiTagStructors.py
+++ b/lldb/test/API/lang/cpp/abi_tag_structors/TestAbiTagStructors.py
@@ -18,7 +18,7 @@ class AbiTagStructorsTestCase(TestBase):
         bugnumber="Required Clang flag not supported",
     )
     @requireClang
-    @expectedFailureAll(oslist=["windows"])
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     @requireExpressionEvaluation
     def test_with_structor_linkage_names(self):
         self.build(dictionary={"CXXFLAGS_EXTRAS": "-gstructor-decl-linkage-names"})
diff --git a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
index cb52c09d35436..c02341356e462 100644
--- a/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
+++ b/lldb/test/API/lang/cpp/auto/TestCPPAuto.py
@@ -9,8 +9,6 @@
 
 @requireExpressionEvaluation
 class CPPAutoTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test that auto types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/bool/TestCPPBool.py b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
index a8cb25047ef4f..a92f1af565c14 100644
--- a/lldb/test/API/lang/cpp/bool/TestCPPBool.py
+++ b/lldb/test/API/lang/cpp/bool/TestCPPBool.py
@@ -7,8 +7,6 @@
 
 
 class CPPBoolTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test that bool types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py b/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
index d044216fe6e52..dc45d611e7f26 100644
--- a/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
+++ b/lldb/test/API/lang/cpp/break-on-initializers/TestBreakOnCPP11Initializers.py
@@ -9,10 +9,12 @@
 
 import lldb
 import lldbsuite.test.lldbutil as lldbutil
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 
 
 class TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_breakpoints_on_initializers(self):
         """Show we can set breakpoints on initializers appearing both before
         and after the constructor body, and hit them."""
diff --git a/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 6ae27a4e49290..1b5baf79c055d 100644
--- a/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/test/API/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
@@ -23,6 +23,7 @@ def make_breakpoint(self, name, type, expected_num_locations):
         )
         return bkpt
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_cpp_breakpoint_cmds(self):
         """Test a sequence of breakpoint command add, list, and delete."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py b/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
index d67150fa44b0d..d2c87df456b4e 100644
--- a/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/char/TestCharTypes.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py b/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
index df2755f430eeb..932dd17192163 100644
--- a/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/int/TestIntTypes.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Check the types and values of all integer-typed variables."""
         self.build_and_run()
diff --git a/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py b/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
index 419546601d20a..190fb54017ee4 100644
--- a/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
+++ b/lldb/test/API/lang/cpp/builtin_types/long_int/TestLongIntTypes.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def _long_size(self):
         """Return sizeof(long) in bytes, read from the 'long_size' global."""
         long_size = self.target().FindFirstGlobalVariable("long_size")
diff --git a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
index 455ca75893e9b..00a2735a40af2 100644
--- a/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
+++ b/lldb/test/API/lang/cpp/call-function/TestCallCPPFunction.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class CallCPPFunctionTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number("main.cpp", "// breakpoint")
diff --git a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
index 398cddb0b9c47..7b81525e9b414 100644
--- a/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
+++ b/lldb/test/API/lang/cpp/chained-calls/TestCppChainedCalls.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCppChainedCalls(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
index b17acbbd1b105..6edac71e06f52 100644
--- a/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/test/API/lang/cpp/char1632_t/TestChar1632T.py
@@ -11,8 +11,6 @@
 
 
 class Char1632TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
index d533c618a47c9..c727ae9cf6ab6 100644
--- a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
+++ b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py
@@ -11,8 +11,6 @@
 
 
 class CxxChar8_tTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIfDarwin  # Chained Fixups
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
     def test_without_process(self):
diff --git a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
index 64bd30c77cf5e..be1c5b54e12c0 100644
--- a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
+++ b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestTemplatePackArgs.py b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestTemplatePackArgs.py
index f2467cbea9439..5273076bf356d 100644
--- a/lldb/test/API/lang/cpp/class-template-parameter-pack/TestTemplatePackArgs.py
+++ b/lldb/test/API/lang/cpp/class-template-parameter-pack/TestTemplatePackArgs.py
@@ -9,6 +9,7 @@
 
 
 class TemplatePackArgsTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_template_argument_pack(self):
         self.build()
         (target, _, thread, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
index efd0a9159ea32..97ff517a97625 100644
--- a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
@@ -17,6 +17,7 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test that file and class static variables display correctly."""
         self.build()
@@ -63,6 +64,7 @@ def test_with_run_command(self):
     @expectedFailureAll(
         compiler=["clang"], compiler_version=["<", "3.9"], bugnumber="llvm.org/pr20550"
     )
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command_complete(self):
         """
         Test that file and class static variables display correctly with
diff --git a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
index b6dc9c5d9e675..b5d5dd2370781 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypes.py
@@ -9,8 +9,6 @@
 
 
 class ClassTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
index 19dfae07bddcd..2bc8f56bf99d1 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -10,8 +10,6 @@
 
 
 class IterateFrameAndDisassembleTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_and_run_command(self):
         """Disassemble each call frame when stopped on C's constructor."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
index 5f4abb1172824..cf9d4d23f609a 100644
--- a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
+++ b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
@@ -12,6 +12,7 @@ class TestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
 
     @requireExpressionEvaluation
+    @skipIf(debug_info=["pdb"], bugnumber="llvm.org/pr149498")  # Asserts in CodeGen
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py b/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
index a9059a9cfd5da..7cb38ecd49c9d 100644
--- a/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
+++ b/lldb/test/API/lang/cpp/const_static_integral_member_int128/TestConstStaticIntegralMemberInt128.py
@@ -13,6 +13,7 @@
 class TestCase(TestBase):
     # int128 is not available on 32-bit ARM.
     @skipIf(archs=["arm$"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_int128(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
index 1a4baf8f9e465..8e178de97eea7 100644
--- a/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
+++ b/lldb/test/API/lang/cpp/constructors/TestCppConstructors.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc")
     def test_constructors(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
index 938fb1a6edf32..79cfd83ac94d7 100644
--- a/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
+++ b/lldb/test/API/lang/cpp/dereferencing_references/TestCPPDereferencingReferences.py
@@ -5,6 +5,7 @@
 
 
 class TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """Tests deferencing lvalue/rvalue references via LLDB's builtin type system."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
index 5c01926b352ef..50307c6f458ba 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -9,7 +9,6 @@
 
 
 class CppValueCastTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @skipIf(bugnumber="llvm.org/PR36714")
diff --git a/lldb/test/API/lang/cpp/enum-limits/TestCPPEnumLimits.py b/lldb/test/API/lang/cpp/enum-limits/TestCPPEnumLimits.py
index a380d6bdcf53d..d5c0365cf06ef 100644
--- a/lldb/test/API/lang/cpp/enum-limits/TestCPPEnumLimits.py
+++ b/lldb/test/API/lang/cpp/enum-limits/TestCPPEnumLimits.py
@@ -8,7 +8,6 @@
 
 class CPPEnumLimitsTestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def check_signed(self, ty: lldb.SBType, expected):
         self.assertEqual(
diff --git a/lldb/test/API/lang/cpp/enum_promotion/TestCPPEnumPromotion.py b/lldb/test/API/lang/cpp/enum_promotion/TestCPPEnumPromotion.py
index f8375b49d96d7..2a73dc5357fe7 100644
--- a/lldb/test/API/lang/cpp/enum_promotion/TestCPPEnumPromotion.py
+++ b/lldb/test/API/lang/cpp/enum_promotion/TestCPPEnumPromotion.py
@@ -9,8 +9,6 @@
 
 
 class TestCPPEnumPromotion(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
index c0bf1df1438b1..fc662f9cdf1f7 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_method/TestExprInConstMethod.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_volatile_method/TestExprInConstVolatileMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_volatile_method/TestExprInConstVolatileMethod.py
index dfa9fbc1a4225..004955cd3b859 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/const_volatile_method/TestExprInConstVolatileMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/const_volatile_method/TestExprInConstVolatileMethod.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
index 41e9d56737299..bfd5f7dba8e5f 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/cv_qualified_objects/TestExprOnCVQualifiedObjects.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/fixit/TestExprInConstMethodWithFixit.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/fixit/TestExprInConstMethodWithFixit.py
index fd9d9ad2a87ad..80e657712a525 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/fixit/TestExprInConstMethodWithFixit.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/fixit/TestExprInConstMethodWithFixit.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
index a81b9223b8e87..a4cdffb19e4cb 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/non_const_method/TestExprInNonConstMethod.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
index 08fe1e0a677be..c20fdd1d34ef9 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_const_method/TestExprInTemplateConstMethod.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
index 56baa18e963b6..5ce0740247286 100644
--- a/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
+++ b/lldb/test/API/lang/cpp/expression-context-qualifiers/template_non_const_method/TestExprInTemplateNonConstMethod.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         (_, process, _, _) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py b/lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py
index 8c757524d1531..81fe024960942 100644
--- a/lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py
+++ b/lldb/test/API/lang/cpp/extern_c/TestExternCSymbols.py
@@ -2,5 +2,12 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(
-    __file__, globals(), decorators=[decorators.skipIfWasm]  # no expression evaluation
+    __file__,
+    globals(),
+    decorators=[
+        decorators.skipIfWasm,  # no expression evaluation
+        decorators.expectedFailureAll(
+            debug_info=["pdb"], bugnumber="llvm.org/pr149498"
+        ),
+    ],
 )
diff --git a/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py b/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
index 9ddffa92b1e8c..34b52f796da28 100644
--- a/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
+++ b/lldb/test/API/lang/cpp/fixits/TestCppFixIts.py
@@ -9,8 +9,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_fixit_with_dwim(self):
         """Confirms `po` shows an expression after applying Fix-It(s)."""
 
diff --git a/lldb/test/API/lang/cpp/floating-types-specialization/TestCppFloatingTypesSpecialization.py b/lldb/test/API/lang/cpp/floating-types-specialization/TestCppFloatingTypesSpecialization.py
index 5376e830eba8a..041288767af50 100644
--- a/lldb/test/API/lang/cpp/floating-types-specialization/TestCppFloatingTypesSpecialization.py
+++ b/lldb/test/API/lang/cpp/floating-types-specialization/TestCppFloatingTypesSpecialization.py
@@ -8,6 +8,7 @@
 @requireNotWasm("_Float16/__bf16 are unsupported on the wasm target")
 class TestCase(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "17.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
index 582ddf5f961a8..f99df6d593127 100644
--- a/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
+++ b/lldb/test/API/lang/cpp/forward-declared-template-specialization/TestCppForwardDeclaredTemplateSpecialization.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """
         Tests a forward declared template and a normal template in the same
diff --git a/lldb/test/API/lang/cpp/forward/TestCPPForwardDeclaration.py b/lldb/test/API/lang/cpp/forward/TestCPPForwardDeclaration.py
index 57eeaa7c494e2..ca380f249ac48 100644
--- a/lldb/test/API/lang/cpp/forward/TestCPPForwardDeclaration.py
+++ b/lldb/test/API/lang/cpp/forward/TestCPPForwardDeclaration.py
@@ -43,6 +43,7 @@ def do_test(self, dictionary=None):
             result_children=[ValueCheck(value="47", name="a", type="int")],
         )
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.do_test()
 
diff --git a/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py b/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
index 60a2ab198fd3f..6093ef91ac1f0 100644
--- a/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
+++ b/lldb/test/API/lang/cpp/fpnan/TestFPNaN.py
@@ -9,8 +9,6 @@
 
 
 class FPNaNTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
index 29f546e815c98..35c4f05d0edb2 100644
--- a/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
+++ b/lldb/test/API/lang/cpp/frame-var-anon-unions/TestFrameVariableAnonymousUnions.py
@@ -7,8 +7,6 @@
 
 
 class FrameVariableAnonymousUnionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Tests that frame variable looks into anonymous unions"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py b/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
index a09c4978c872a..33648678da797 100644
--- a/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
+++ b/lldb/test/API/lang/cpp/frame-var-depth-and-elem-count/TestFrameVarDepthAndElemCount.py
@@ -8,8 +8,6 @@
 
 
 class TestFrameVarDepthAndElemCount(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that bool types work in the expression parser"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py b/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
index 16b1b3f9a5daa..92973536889f6 100644
--- a/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
+++ b/lldb/test/API/lang/cpp/function-call-from-object-file/TestFunctionCallFromObjectFile.py
@@ -17,8 +17,6 @@
 
 @requireExpressionEvaluation
 class TestFunctionCallFromObjectFile(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_lib1(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "lib1_func")
diff --git a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
index 001b657b4eb9f..3e11b8c533923 100644
--- a/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
+++ b/lldb/test/API/lang/cpp/function-qualifiers/TestCppFunctionQualifiers.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestFunctionQualifiers(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/function-ref-qualifiers/TestCppFunctionRefQualifiers.py b/lldb/test/API/lang/cpp/function-ref-qualifiers/TestCppFunctionRefQualifiers.py
index 1ad852adfcad5..c90fd96db8aba 100644
--- a/lldb/test/API/lang/cpp/function-ref-qualifiers/TestCppFunctionRefQualifiers.py
+++ b/lldb/test/API/lang/cpp/function-ref-qualifiers/TestCppFunctionRefQualifiers.py
@@ -12,6 +12,7 @@
 
 @requireExpressionEvaluation
 class TestFunctionRefQualifiers(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py b/lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py
index 0cdd46e00c068..c8308c16011e0 100644
--- a/lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py
+++ b/lldb/test/API/lang/cpp/function_refs/TestFunctionRefs.py
@@ -1,4 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals())
diff --git a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
index 93dae5c286f27..94348fc1745f6 100644
--- a/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
+++ b/lldb/test/API/lang/cpp/global_operators/TestCppGlobalOperators.py
@@ -9,8 +9,6 @@
 
 @requireExpressionEvaluation
 class TestCppGlobalOperators(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def prepare_executable_and_get_frame(self):
         self.build()
 
diff --git a/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py b/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
index 9d964634adbbd..d9189651bd42a 100644
--- a/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
+++ b/lldb/test/API/lang/cpp/global_variables/TestCPPGlobalVariables.py
@@ -11,6 +11,7 @@ def setUp(self):
         TestBase.setUp(self)
         self.source = lldb.SBFileSpec("main.cpp")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
index 74094673a3095..0056a26f72f5a 100644
--- a/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
+++ b/lldb/test/API/lang/cpp/incompatible-class-templates/TestCppIncompatibleClassTemplates.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """
         Test debugging a binary that has two templates with the same name
diff --git a/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
index 40dc8053437c0..942092223e55e 100644
--- a/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
+++ b/lldb/test/API/lang/cpp/incomplete-stl-types/TestStlIncompleteTypes.py
@@ -10,8 +10,6 @@
 
 
 class TestStlIncompleteTypes(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
index dc8c3020192e9..abb8dd69e0c5a 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
@@ -5,8 +5,6 @@
 
 
 class TestCppIncompleteTypes(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIf(compiler="gcc")
     def test_limit_debug_info(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
index 8a1c03e8164bc..35a8a87cec8ea 100644
--- a/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
+++ b/lldb/test/API/lang/cpp/incomplete-types/members/TestCppIncompleteTypeMembers.py
@@ -10,8 +10,6 @@
 
 
 class TestCppIncompleteTypeMembers(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIf(oslist=["darwin", "macos"], debug_info="gmodules")
     def test(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/inline-namespace-in-typename/TestInlineNamespaceInTypename.py b/lldb/test/API/lang/cpp/inline-namespace-in-typename/TestInlineNamespaceInTypename.py
index 19681364466ce..53a4e142c67e0 100644
--- a/lldb/test/API/lang/cpp/inline-namespace-in-typename/TestInlineNamespaceInTypename.py
+++ b/lldb/test/API/lang/cpp/inline-namespace-in-typename/TestInlineNamespaceInTypename.py
@@ -1,9 +1,11 @@
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestInlineNamespaceInTypename(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """
         Tests that we correctly omit the inline namespace when printing
diff --git a/lldb/test/API/lang/cpp/inlines/TestInlines.py b/lldb/test/API/lang/cpp/inlines/TestInlines.py
index d6a721a960773..06b4dee67928c 100644
--- a/lldb/test/API/lang/cpp/inlines/TestInlines.py
+++ b/lldb/test/API/lang/cpp/inlines/TestInlines.py
@@ -8,8 +8,6 @@
 
 
 class InlinesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py b/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
index 1b4acb8ff0ead..f0b5ba278f79f 100644
--- a/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
+++ b/lldb/test/API/lang/cpp/llvm-style/TestLLVMStyle.py
@@ -1,9 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(
-    __file__,
-    globals(),
-    [decorators.requireExpressionEvaluation],
-    test_with_pdb_debug_info=True,
-)
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.requireExpressionEvaluation])
diff --git a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
index ebd9997959588..311a59da0edb2 100644
--- a/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
+++ b/lldb/test/API/lang/cpp/member-and-local-vars-with-same-name/TestMembersAndLocalsWithSameName.py
@@ -5,8 +5,6 @@
 
 
 class TestMembersAndLocalsWithSameName(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_when_stopped_in_method(self):
         self._load_exe()
 
diff --git a/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py b/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
index 79e25595e4ede..1145076080d14 100644
--- a/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
+++ b/lldb/test/API/lang/cpp/multiple-inheritance/TestCppMultipleInheritance.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/namespace/TestNamespace.py b/lldb/test/API/lang/cpp/namespace/TestNamespace.py
index 36ce3eb8803e1..5546ab1ed9b54 100644
--- a/lldb/test/API/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/test/API/lang/cpp/namespace/TestNamespace.py
@@ -46,6 +46,7 @@ def test_breakpoints_func_auto(self):
             )
 
     @expectedFailureAll(bugnumber="llvm.org/pr28548", compiler="gcc")
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_breakpoints_func_full(self):
         """Test that we can set breakpoints correctly by fullname to find all functions whose fully qualified name is "func"
         (no namespaces)."""
@@ -75,6 +76,7 @@ def test_breakpoints_func_full(self):
                 "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeFull",
             )
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_breakpoints_a_func_full(self):
         """Test that we can set breakpoints correctly by fullname to find all functions whose fully qualified name is "A::func"."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
index 9c42fd94ce3b9..9dcb8fb91a1ae 100644
--- a/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/lldb/test/API/lang/cpp/namespace/TestNamespaceLookup.py
@@ -11,7 +11,6 @@
 from lldbsuite.test import lldbplatformutil
 
 class NamespaceLookupTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py b/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
index 1b4acb8ff0ead..f0b5ba278f79f 100644
--- a/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
+++ b/lldb/test/API/lang/cpp/namespace_conflicts/TestNamespaceConflicts.py
@@ -1,9 +1,4 @@
 from lldbsuite.test import lldbinline
 from lldbsuite.test import decorators
 
-lldbinline.MakeInlineTest(
-    __file__,
-    globals(),
-    [decorators.requireExpressionEvaluation],
-    test_with_pdb_debug_info=True,
-)
+lldbinline.MakeInlineTest(__file__, globals(), [decorators.requireExpressionEvaluation])
diff --git a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
index 2ad36e66257df..9cf439b965f6f 100644
--- a/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
+++ b/lldb/test/API/lang/cpp/nested-class-other-compilation-unit/TestNestedClassWithParentInAnotherCU.py
@@ -9,8 +9,6 @@
 
 
 class TestNestedClassWithParentInAnotherCU(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_nested_class_with_parent_in_another_cu(self):
         self.main_source_file = lldb.SBFileSpec("main.cpp")
         self.build()
diff --git a/lldb/test/API/lang/cpp/nested-template/TestNestedTemplate.py b/lldb/test/API/lang/cpp/nested-template/TestNestedTemplate.py
index 84abb468a7f00..d651b15bed3a4 100644
--- a/lldb/test/API/lang/cpp/nested-template/TestNestedTemplate.py
+++ b/lldb/test/API/lang/cpp/nested-template/TestNestedTemplate.py
@@ -32,6 +32,7 @@ def do_test(self, debug_flags):
 
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler_version=["<", "15.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_simple_template_names(self):
         self.do_test(dict(TEST_CFLAGS_EXTRAS="-gsimple-template-names"))
 
diff --git a/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py b/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
index b1136daec2326..d16aaa14153fd 100644
--- a/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
+++ b/lldb/test/API/lang/cpp/no_unique_address/TestNoUniqueAddress.py
@@ -10,8 +10,6 @@
 
 
 class NoUniqueAddressTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py b/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
index c61bdc9cb4ac3..e1c01ecf1181b 100644
--- a/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
+++ b/lldb/test/API/lang/cpp/nsimport/TestCppNsImport.py
@@ -8,6 +8,7 @@
 
 
 class TestCppNsImport(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Tests imported namespaces in C++."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
index 5bbca2a351300..2e67ba364b3c8 100644
--- a/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
+++ b/lldb/test/API/lang/cpp/operator-overload/TestOperatorOverload.py
@@ -5,8 +5,6 @@
 
 
 class TestOperatorOverload(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_overload(self):
         self.build()
         (target, process, thread, main_breakpoint) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/operators/TestCppOperators.py b/lldb/test/API/lang/cpp/operators/TestCppOperators.py
index 21ba89e386727..65b0e9a480cfb 100644
--- a/lldb/test/API/lang/cpp/operators/TestCppOperators.py
+++ b/lldb/test/API/lang/cpp/operators/TestCppOperators.py
@@ -8,5 +8,4 @@
         decorators.requireExpressionEvaluation,
         decorators.expectedFailureAll(bugnumber="llvm.org/pr50814", compiler="gcc"),
     ],
-    test_with_pdb_debug_info=True,
 )
diff --git a/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
index 8263697f870ef..bdd0836998379 100644
--- a/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
+++ b/lldb/test/API/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class OverloadedFunctionsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test that functions with the same name are resolved correctly"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/preferred_name/TestPreferredName.py b/lldb/test/API/lang/cpp/preferred_name/TestPreferredName.py
index f96bedf034ffa..7c0e60ebec063 100644
--- a/lldb/test/API/lang/cpp/preferred_name/TestPreferredName.py
+++ b/lldb/test/API/lang/cpp/preferred_name/TestPreferredName.py
@@ -11,6 +11,7 @@
 
 class TestPreferredName(TestBase):
     @skipIf(compiler="clang", compiler_version=["<", "16.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_frame_var(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.cpp"))
@@ -27,6 +28,7 @@ def test_frame_var(self):
         self.expect("frame variable varFooInt", substrs=["Foo<BarInt>"])
 
     @skipIf(compiler="clang", compiler_version=["<", "16.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_expr(self):
         self.build()
         lldbutil.run_to_source_breakpoint(self, "return", lldb.SBFileSpec("main.cpp"))
diff --git a/lldb/test/API/lang/cpp/recursive_types/function-ptrs/TestRecursiveTypesFuncPtrs.py b/lldb/test/API/lang/cpp/recursive_types/function-ptrs/TestRecursiveTypesFuncPtrs.py
index 9a2824c8f163d..b53d78878b7e7 100644
--- a/lldb/test/API/lang/cpp/recursive_types/function-ptrs/TestRecursiveTypesFuncPtrs.py
+++ b/lldb/test/API/lang/cpp/recursive_types/function-ptrs/TestRecursiveTypesFuncPtrs.py
@@ -11,6 +11,7 @@
 
 
 class TestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build_and_run()
 
diff --git a/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py b/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
index a6e419b7fcdfa..202876c1c3da1 100644
--- a/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
+++ b/lldb/test/API/lang/cpp/reference-to-outer-type/TestCppReferenceToOuterClass.py
@@ -1,4 +1,3 @@
-import unittest
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
@@ -6,7 +5,8 @@
 
 
 class TestCase(TestBase):
-    @unittest.expectedFailure  # The fix for this was reverted due to llvm.org/PR52257
+    # The fix for this was reverted due to llvm.org/PR52257
+    @expectedFailureAll(debug_info=no_match(["pdb"]))
     def test(self):
         self.build()
         self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
diff --git a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
index c4fb8e0aacb99..c78765e2e1808 100644
--- a/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
+++ b/lldb/test/API/lang/cpp/rvalue-references/TestRvalueReferences.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class RvalueReferencesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     # rdar://problem/11479676
     @expectedFailureAll(
         compiler="icc",
diff --git a/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py b/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
index 2a5c9bb1bd766..aaff4a55f1526 100644
--- a/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/test/API/lang/cpp/signed_types/TestSignedTypes.py
@@ -18,7 +18,10 @@ def setUp(self):
         self.line = line_number(self.source, "// Set break point at this line.")
 
     @expectedFailureAll(
-        oslist=["windows"], archs=["i[3-6]86", "x86_64"], bugnumber="llvm.org/pr24489"
+        oslist=["windows"],
+        debug_info=no_match(["pdb"]),
+        archs=["i[3-6]86", "x86_64"],
+        bugnumber="llvm.org/pr24489",
     )
     def test(self):
         """Test that variables with signed types display correctly."""
diff --git a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
index 1ad150512090c..defe353cd0fd1 100644
--- a/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
+++ b/lldb/test/API/lang/cpp/sizeof/TestCPPSizeof.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         self.createTestTarget()
diff --git a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
index 5f64a29d2cbf8..96ab6b498c27d 100644
--- a/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/test/API/lang/cpp/static_members/TestCPPStaticMembers.py
@@ -11,7 +11,7 @@
 
 class TestCase(TestBase):
     # We fail to lookup static members on Windows.
-    @expectedFailureAll(oslist=["windows"])
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     @requireExpressionEvaluation
     def test_access_from_main(self):
         self.build()
@@ -24,7 +24,7 @@ def test_access_from_main(self):
         self.expect_expr("my_a.s_c", result_type="int", result_value="3")
 
     # We fail to lookup static members on Windows.
-    @expectedFailureAll(oslist=["windows"])
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     @requireExpressionEvaluation
     def test_access_from_member_function(self):
         self.build()
@@ -47,7 +47,7 @@ def test_access_without_scope(self):
         )
 
     # We fail to lookup static members on Windows.
-    @expectedFailureAll(oslist=["windows"])
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     @requireExpressionEvaluation
     def test_no_crash_in_IR_arithmetic(self):
         """
diff --git a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
index 934be881b779b..9a866542088bb 100644
--- a/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
+++ b/lldb/test/API/lang/cpp/static_methods/TestCPPStaticMethods.py
@@ -10,8 +10,6 @@
 
 @requireExpressionEvaluation
 class CPPStaticMethodsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_with_run_command(self):
         """Test that static methods are properly distinguished from regular methods"""
         self.build()
diff --git a/lldb/test/API/lang/cpp/step-through-trampoline/TestStepThroughTrampoline.py b/lldb/test/API/lang/cpp/step-through-trampoline/TestStepThroughTrampoline.py
index 732c3660b6bfd..2fb08e5de0b24 100644
--- a/lldb/test/API/lang/cpp/step-through-trampoline/TestStepThroughTrampoline.py
+++ b/lldb/test/API/lang/cpp/step-through-trampoline/TestStepThroughTrampoline.py
@@ -6,6 +6,7 @@
 
 @skipIfTargetDoesNotSupportSharedLibraries()
 class StepThroughTrampoline(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/stl/TestSTL.py b/lldb/test/API/lang/cpp/stl/TestSTL.py
index ee4f04661610f..8f7402f14eb92 100644
--- a/lldb/test/API/lang/cpp/stl/TestSTL.py
+++ b/lldb/test/API/lang/cpp/stl/TestSTL.py
@@ -34,6 +34,7 @@ def test(self):
         bugnumber="ICC (13.1, 14-beta) do not emit DW_TAG_template_type_parameter.",
     )
     @add_test_categories(["pyapi"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_SBType_template_aspects(self):
         """Test APIs for getting template arguments from an SBType."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py b/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
index 882c91d1ce8c8..92cb1a4908a03 100644
--- a/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
+++ b/lldb/test/API/lang/cpp/structured-binding/TestStructuredBinding.py
@@ -7,6 +7,7 @@
 class TestStructuredBinding(TestBase):
     @skipIf(oslist=["linux"], archs=["arm$"])
     @skipIf(compiler="clang", compiler_version=["<", "14.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py b/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
index 37d2033a0eb7e..4f21c69e890cc 100644
--- a/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
+++ b/lldb/test/API/lang/cpp/template-alias/TestTemplateAlias.py
@@ -5,7 +5,6 @@
 
 
 class TestTemplateAlias(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, extra_flags):
diff --git a/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py b/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
index cdc8211bcd636..e24acbedbaf2d 100644
--- a/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
+++ b/lldb/test/API/lang/cpp/template-specialization-type/TestTemplateSpecializationType.py
@@ -8,6 +8,7 @@
 
 
 class TemplateSpecializationTypeTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_template_specialization_cast_children(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
index adff1a3b6d4e1..fed11f601216e 100644
--- a/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
+++ b/lldb/test/API/lang/cpp/template/TestTemplateArgs.py
@@ -13,9 +13,7 @@
 
 @skipIfWasm  # no expression evaluation
 class TemplateArgsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
-    TEST_WITH_PDB_DEBUG_INFO = True
 
     def prepareProcess(self):
         self.build()
diff --git a/lldb/test/API/lang/cpp/thunk/TestThunk.py b/lldb/test/API/lang/cpp/thunk/TestThunk.py
index cd722788c5a68..9370c1c58c18b 100644
--- a/lldb/test/API/lang/cpp/thunk/TestThunk.py
+++ b/lldb/test/API/lang/cpp/thunk/TestThunk.py
@@ -5,8 +5,6 @@
 
 
 class ThunkTest(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_step_through_thunk(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "testit")
diff --git a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
index 81308a3dc6def..8c9fe09060106 100644
--- a/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
+++ b/lldb/test/API/lang/cpp/type_lookup/TestCppTypeLookup.py
@@ -10,8 +10,6 @@
 
 
 class TestCppTypeLookup(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def check_value(self, value, ivar_name, ivar_value):
         self.assertSuccess(value.GetError(), "Invalid valobj")
         ivar = value.GetChildMemberWithName(ivar_name)
diff --git a/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py b/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
index 9bdb42e8bcb83..265a96f7da152 100644
--- a/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
+++ b/lldb/test/API/lang/cpp/type_lookup_anon_struct/TestCppTypeLookupAnonStruct.py
@@ -9,8 +9,6 @@
 
 
 class TestTypeLookupAnonStruct(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_lookup_anon_struct(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py b/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
index 1dbc51d7d3ac5..dbaa50e76c546 100644
--- a/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
+++ b/lldb/test/API/lang/cpp/type_lookup_duplicate/TestCppTypeLookupDuplicate.py
@@ -9,8 +9,6 @@
 
 
 class TestTypeLookupDuplicate(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_namespace_only(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py b/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
index 9ec4fd043016d..7e9f6967a1288 100644
--- a/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
+++ b/lldb/test/API/lang/cpp/typedef-to-outer-fwd/TestTypedefToOuterFwd.py
@@ -16,8 +16,6 @@ class TestCaseTypedefToOuterFwd(TestBase):
     in main.o or lib.o.
     """
 
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def check_global_var(self, target, name: str):
         var = target.FindFirstGlobalVariable(name)
         self.assertSuccess(var.GetError(), f"Found {name}")
diff --git a/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py b/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
index 65b74e4782da1..3ba228079714d 100644
--- a/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
+++ b/lldb/test/API/lang/cpp/typedef/TestCppTypedef.py
@@ -10,6 +10,7 @@
 
 @requireExpressionEvaluation
 class TestCppTypedef(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_typedef(self):
         """
         Test that we retrieve typedefed types correctly
diff --git a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
index 6f0db022fa08f..96e34d52c834c 100644
--- a/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
+++ b/lldb/test/API/lang/cpp/unicode-literals/TestUnicodeLiterals.py
@@ -25,8 +25,6 @@
 
 @requireExpressionEvaluation
 class UnicodeLiteralsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_expr1(self):
         """Test that the expression parser returns proper Unicode strings."""
         self.rdar12991846(expr=1)
diff --git a/lldb/test/API/lang/cpp/union-static-data-members/TestCppUnionStaticMembers.py b/lldb/test/API/lang/cpp/union-static-data-members/TestCppUnionStaticMembers.py
index 8317bb299d407..4ec60318768bd 100644
--- a/lldb/test/API/lang/cpp/union-static-data-members/TestCppUnionStaticMembers.py
+++ b/lldb/test/API/lang/cpp/union-static-data-members/TestCppUnionStaticMembers.py
@@ -33,7 +33,7 @@ def test_print_union(self):
             result_children=[ValueCheck(name="val", value="137")],
         )
 
-    @expectedFailureWindows
+    @expectedFailureAll(oslist=["windows"], debug_info=no_match(["pdb"]))
     def test_expr_union_static_members(self):
         """Tests that frame variable and expr work
         for union static data members"""
diff --git a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
index 92934b8d2d51f..69ef8ea1445c1 100644
--- a/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/test/API/lang/cpp/unique-types/TestUniqueTypes.py
@@ -9,8 +9,6 @@
 
 
 class UniqueTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test for unique types of std::vector<long> and std::vector<short>."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/unique-types2/TestUniqueTypes2.py b/lldb/test/API/lang/cpp/unique-types2/TestUniqueTypes2.py
index defb41cd8bcac..2456744b9760b 100644
--- a/lldb/test/API/lang/cpp/unique-types2/TestUniqueTypes2.py
+++ b/lldb/test/API/lang/cpp/unique-types2/TestUniqueTypes2.py
@@ -147,10 +147,12 @@ def do_test(self, debug_flags):
 
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler_version=["<", "15.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_simple_template_names(self):
         self.do_test(dict(CFLAGS_EXTRAS="-gsimple-template-names"))
 
     @skipIf(compiler=no_match("clang"))
     @skipIf(compiler_version=["<", "15.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_no_simple_template_names(self):
         self.do_test(dict(CFLAGS_EXTRAS="-gno-simple-template-names"))
diff --git a/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py b/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
index 35107dc2435a9..9f41bbeee0636 100644
--- a/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
+++ b/lldb/test/API/lang/cpp/unique-types3/TestUniqueTypes3.py
@@ -9,7 +9,6 @@
 
 
 class UniqueTypesTestCase3(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def do_test(self, debug_flags):
diff --git a/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
index 4796c84966675..9e6206fad7307 100644
--- a/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/API/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -10,6 +10,7 @@
 
 
 class UnsignedTypesTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """Test that variables with unsigned types display correctly."""
         self.build()
diff --git a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
index 232f53ef980ad..dfd6ab5e71d29 100644
--- a/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
+++ b/lldb/test/API/lang/cpp/virtual-functions/TestCppVirtualFunctions.py
@@ -6,8 +6,6 @@
 
 @requireExpressionEvaluation
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def common_setup(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py b/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
index 0dc52254cb21d..1311a14932621 100644
--- a/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
+++ b/lldb/test/API/lang/cpp/virtual-overload/TestVirtualOverload.py
@@ -1,3 +1,3 @@
 from lldbsuite.test import lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals())
diff --git a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
index 9f49dad2c10ea..f17d5a707c9e3 100644
--- a/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/test/API/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -10,8 +10,6 @@
 
 
 class CxxWCharTTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that C++ supports wchar_t correctly."""
         self.build()
diff --git a/lldb/test/API/lang/mixed/TestMixedLanguages.py b/lldb/test/API/lang/mixed/TestMixedLanguages.py
index d7ab89e89ab7f..e63c2fb565a31 100644
--- a/lldb/test/API/lang/mixed/TestMixedLanguages.py
+++ b/lldb/test/API/lang/mixed/TestMixedLanguages.py
@@ -3,10 +3,12 @@
 
 import re
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 
 
 class MixedLanguagesTestCase(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_language_of_frame(self):
         """Test that the language defaults to the language of the current frame."""
         self.build()
diff --git a/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py b/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
index fe474ef5a8fd7..96fe8667e0d29 100644
--- a/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
+++ b/lldb/test/API/python_api/compile_unit/TestCompileUnitAPI.py
@@ -72,6 +72,7 @@ def find_main_compile_unit(self) -> lldb.SBCompileUnit:
         self.assertTrue(main_cu.IsValid(), "Main executable CU is not valid")
         return main_cu
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_is_optimized(self):
         """A compile unit built with optimization reports it."""
         self.build(dictionary={"CFLAGS_EXTRAS": "-O1"})
diff --git a/lldb/test/API/python_api/frame/TestFrames.py b/lldb/test/API/python_api/frame/TestFrames.py
index 2f5fd1c7bf1a0..38e534a0251d2 100644
--- a/lldb/test/API/python_api/frame/TestFrames.py
+++ b/lldb/test/API/python_api/frame/TestFrames.py
@@ -12,8 +12,6 @@
 
 
 class FrameAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @skipIfWasm  # Wasm exposes no register sets, so there is no pc or sp register to read
     def test_get_arg_vals_for_call_stack(self):
         """Exercise SBFrame.GetVariables() API to get argument vals."""
diff --git a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
index 782edfa3c5e0d..d0e1d71f86f0a 100644
--- a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
+++ b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
@@ -37,6 +37,7 @@ def verify_variable_names(self, description, value_list, names):
             % (description, copy_names, actual_names),
         )
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
index dd53b6e5d4b77..6f449d2c34458 100644
--- a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
@@ -21,6 +21,7 @@ def setUp(self):
             self.source, "// This should correspond to the second break stop."
         )
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_stop_at_outer_inline(self):
         """Exercise SBFrame.IsInlined() and SBFrame.GetFunctionName()."""
         self.build()
diff --git a/lldb/test/API/python_api/frame_list/TestSBFrameList.py b/lldb/test/API/python_api/frame_list/TestSBFrameList.py
index f38bfbd9b3731..f348ce492e547 100644
--- a/lldb/test/API/python_api/frame_list/TestSBFrameList.py
+++ b/lldb/test/API/python_api/frame_list/TestSBFrameList.py
@@ -9,8 +9,6 @@
 
 
 class FrameListAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_frame_list_api(self):
         """Test SBThread.GetFrames() returns a valid SBFrameList."""
         self.build()
diff --git a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
index bd5623da98d98..c4dbb2be27113 100644
--- a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
@@ -20,7 +20,9 @@ def setUp(self):
             "main.c", "// Find the line number for breakpoint 2 here."
         )
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr21765"
+    )
     def test(self):
         """Exercise getting SBAddress objects, disassembly, and SBAddress APIs."""
         self.build()
diff --git a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
index 309e3796dbd48..044a466257fed 100644
--- a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
@@ -20,7 +20,9 @@ def setUp(self):
             "main.c", "// Find the line number for breakpoint 2 here."
         )
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr21765"
+    )
     def test(self):
         """Exercise some SBSymbol and SBAddress APIs."""
         self.build()
diff --git a/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py b/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
index 5efb4e014f25b..a09c4a71c9948 100644
--- a/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
+++ b/lldb/test/API/python_api/interpreter/TestCommandOverrideCallback.py
@@ -5,8 +5,6 @@
 
 
 class CommandOverrideCallback(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         TestBase.setUp(self)
         self.line = line_number("main.c", "Hello world.")
diff --git a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
index a6b3b1a89c271..ca1f0873242e0 100644
--- a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
@@ -9,8 +9,6 @@
 
 
 class FrameUtilsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
index 131e8b2573a82..b24d4796d53fa 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -10,8 +10,6 @@
 
 @requireThreadSupport
 class LLDBIteratorTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
index c91b8064772e7..38b1e530c730e 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -10,8 +10,6 @@
 
 @requireThreadSupport
 class RegistersIteratorTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
index 59e307f69e0e5..221a20b4c44cf 100644
--- a/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/test/API/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -10,8 +10,6 @@
 
 
 class ThreadsStackTracesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_stack_traces(self):
         """Test SBprocess and SBThread APIs with printing of the stack traces."""
         self.build()
diff --git a/lldb/test/API/python_api/module_section/TestModuleAndSection.py b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
index c37bf77dbdc65..6086370375757 100644
--- a/lldb/test/API/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
@@ -10,7 +10,6 @@
 
 
 class ModuleAndSectionAPIsTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_module_and_section(self):
diff --git a/lldb/test/API/python_api/process/TestProcessAPI.py b/lldb/test/API/python_api/process/TestProcessAPI.py
index ab87a60f9bb10..a31b63403f140 100644
--- a/lldb/test/API/python_api/process/TestProcessAPI.py
+++ b/lldb/test/API/python_api/process/TestProcessAPI.py
@@ -10,8 +10,6 @@
 
 
 class ProcessAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
diff --git a/lldb/test/API/python_api/sbmodule/FindTypes/TestSBModuleFindTypes.py b/lldb/test/API/python_api/sbmodule/FindTypes/TestSBModuleFindTypes.py
index 5c3d2b4187ddf..7faf829bfe03d 100644
--- a/lldb/test/API/python_api/sbmodule/FindTypes/TestSBModuleFindTypes.py
+++ b/lldb/test/API/python_api/sbmodule/FindTypes/TestSBModuleFindTypes.py
@@ -7,6 +7,7 @@
 
 
 class TestSBModuleFindTypes(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_lookup_in_template_scopes(self):
         self.build()
         spec = lldb.SBModuleSpec()
diff --git a/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py b/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
index ba2f828c482c2..784f3e177d970 100644
--- a/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
+++ b/lldb/test/API/python_api/sbtype_basic_type/TestSBTypeBasicType.py
@@ -5,8 +5,6 @@
 
 
 class TestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         """Test that SBType.GetBasicType unwraps typedefs."""
         self.build()
diff --git a/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py b/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
index dec4bce74aac7..a3d43c1bdeeb2 100644
--- a/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
+++ b/lldb/test/API/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
@@ -1,3 +1,3 @@
 import lldbsuite.test.lldbinline as lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals(), test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals())
diff --git a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
index ccea9336958ee..806fdceae271e 100644
--- a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
@@ -17,7 +17,9 @@ def setUp(self):
             "main.c", '// Find the line number of function "c" here.'
         )
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr24778"
+    )
     def test(self):
         """Exercise SBSymbolContext API extensively."""
         self.build()
diff --git a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
index 287e8ae6706c0..0d3209b355e00 100644
--- a/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
+++ b/lldb/test/API/python_api/symbol-context/two-files/TestSymbolContextTwoFiles.py
@@ -10,8 +10,6 @@
 
 
 class SymbolContextTwoFilesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @expectedFailureAll(oslist=["windows"])
     def test_lookup_by_address(self):
         """Test lookup by address in a module with multiple compilation units"""
diff --git a/lldb/test/API/python_api/target/TestTargetAPI.py b/lldb/test/API/python_api/target/TestTargetAPI.py
index e4e2df57f1513..101a04a6bf3a7 100644
--- a/lldb/test/API/python_api/target/TestTargetAPI.py
+++ b/lldb/test/API/python_api/target/TestTargetAPI.py
@@ -30,6 +30,7 @@ def setUp(self):
     #
     # It does not segfaults now.  But for dwarf, the variable value is None if
     # the inferior process does not exist yet.  The radar has been updated.
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_find_global_variables(self):
         """Exercise SBTarget.FindGlobalVariables() API."""
         d = {"EXE": "b.out"}
@@ -57,7 +58,9 @@ def test_get_description(self):
         self.build()
         self.get_description()
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
+    @expectedFailureAll(
+        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr21765"
+    )
     def test_resolve_symbol_context_with_address(self):
         """Exercise SBTarget.ResolveSymbolContextForAddress() API."""
         self.build()
diff --git a/lldb/test/API/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py
index 61a2fa71383b4..86c2c838746e2 100644
--- a/lldb/test/API/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/API/python_api/thread/TestThreadAPI.py
@@ -10,7 +10,6 @@
 
 
 class ThreadAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_get_process(self):
diff --git a/lldb/test/API/python_api/type/TestTypeList.py b/lldb/test/API/python_api/type/TestTypeList.py
index b256992a9549f..dc48fe99c5ce1 100644
--- a/lldb/test/API/python_api/type/TestTypeList.py
+++ b/lldb/test/API/python_api/type/TestTypeList.py
@@ -74,6 +74,7 @@ def _find_static_field_in_Task_pointer(self, task_pointer):
         self.assertFalse(static_mutable_field.GetConstantValue(self.target()))
 
     @skipIf(compiler="clang", compiler_version=["<", "17.0"])
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         """Exercise SBType and SBTypeList API."""
         d = {"EXE": self.exe_name}
@@ -275,6 +276,7 @@ def test(self):
             self.DebugSBType(int_enum_uchar)
             self.assertEqual(int_enum_uchar.GetName(), "unsigned char")
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_nested_typedef(self):
         """Exercise FindDirectNestedType for typedefs."""
         self.build()
@@ -332,6 +334,7 @@ def test_dynamic_values(self):
         self.assertTrue(get_function_type.is_function)
         self.assertFalse(get_function_type.is_reference)
 
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_GetByteAlign(self):
         """Exercise SBType::GetByteAlign"""
         self.build()
diff --git a/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py b/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
index 33f08b266ae37..7600a388711dd 100644
--- a/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
+++ b/lldb/test/API/python_api/unified_section_list/TestModuleUnifiedSectionList.py
@@ -13,7 +13,6 @@
 
 
 class ModuleUnifiedSectionList(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @requirePlatform(["linux", "freebsd", "netbsd"])
diff --git a/lldb/test/API/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py
index 08538cb761e25..a8c6141413bc4 100644
--- a/lldb/test/API/python_api/value/TestValueAPI.py
+++ b/lldb/test/API/python_api/value/TestValueAPI.py
@@ -9,7 +9,6 @@
 
 
 class ValueAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py b/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
index af676e15209c6..8e0c54becfbd5 100644
--- a/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
+++ b/lldb/test/API/python_api/value/addr_of_void_star/TestValueAPIAddressOfVoidStar.py
@@ -5,8 +5,6 @@
 
 
 class ValueAPIVoidStarTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/value/change_ptr/TestChangePtr.py b/lldb/test/API/python_api/value/change_ptr/TestChangePtr.py
index 92c0e06c229c0..294330b3ccac1 100644
--- a/lldb/test/API/python_api/value/change_ptr/TestChangePtr.py
+++ b/lldb/test/API/python_api/value/change_ptr/TestChangePtr.py
@@ -6,6 +6,7 @@
 
 class ChangePtrTest(TestBase):
     @skipIfWasm  # the test checks the address of a persistent expression result
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
index aa87427018737..5e9e6861f4f24 100644
--- a/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/test/API/python_api/value/change_values/TestChangeValueAPI.py
@@ -9,7 +9,6 @@
 
 
 class ChangeValueAPITestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
index 9356e35a1f888..82de6e126a3e5 100644
--- a/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
+++ b/lldb/test/API/python_api/value/empty_class/TestValueAPIEmptyClass.py
@@ -5,8 +5,6 @@
 
 
 class ValueAPIEmptyClassTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
         line = line_number("main.cpp", "// Break at this line")
diff --git a/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py b/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
index 821a11ff4d483..96eb0dfa2ebc8 100644
--- a/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
+++ b/lldb/test/API/python_api/value/get_expr_path/TestValueAPIGetExpressionPath.py
@@ -4,8 +4,6 @@
 
 
 class ValueAPIGetExpressionPath(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test(self):
         self.build()
 
diff --git a/lldb/test/API/python_api/value/value_wrap/TestValueAPIWrapper.py b/lldb/test/API/python_api/value/value_wrap/TestValueAPIWrapper.py
index 291119815d403..25342a4cfe07b 100644
--- a/lldb/test/API/python_api/value/value_wrap/TestValueAPIWrapper.py
+++ b/lldb/test/API/python_api/value/value_wrap/TestValueAPIWrapper.py
@@ -3,11 +3,13 @@
 """
 
 import lldb
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class ValueAPIWrapper(TestBase):
+    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_accessors(self):
         """Test non-modifying operators (e.g. __getitem__, __add__)."""
         self.build()
diff --git a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
index 3824ed0decc69..8e7559abb2d53 100644
--- a/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/test/API/python_api/value_var_update/TestValueVarUpdate.py
@@ -8,7 +8,6 @@
 
 
 class ValueVarUpdateTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test_with_process_launch_api(self):
diff --git a/lldb/test/API/sample_test/TestSampleInlineTest.py b/lldb/test/API/sample_test/TestSampleInlineTest.py
index 7b80914c7a66d..af926de18ab34 100644
--- a/lldb/test/API/sample_test/TestSampleInlineTest.py
+++ b/lldb/test/API/sample_test/TestSampleInlineTest.py
@@ -4,4 +4,4 @@
 
 from lldbsuite.test import lldbinline
 
-lldbinline.MakeInlineTest(__file__, globals(), None, test_with_pdb_debug_info=True)
+lldbinline.MakeInlineTest(__file__, globals(), None)
diff --git a/lldb/test/API/symstore/TestSymStore.py b/lldb/test/API/symstore/TestSymStore.py
index 58db4e70a9aff..0e59ed6b91dca 100644
--- a/lldb/test/API/symstore/TestSymStore.py
+++ b/lldb/test/API/symstore/TestSymStore.py
@@ -247,7 +247,6 @@ def log_message(self, *args):
 
 
 class SymStoreTests(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     # Build artifacts can't be shared across test functions because
     # MockedSymStore moves the built PDB out of the build directory to simulate
     # it being absent from the normal lookup path.
diff --git a/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py b/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
index dc8258857b700..b3c6627641775 100644
--- a/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
+++ b/lldb/test/API/terminal/hidden_frame_markers/TestHiddenFrameMarkers.py
@@ -9,8 +9,6 @@
 
 
 class HiddenFrameMarkerTest(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @unicode_test
     @expectedFailureWindows(
         bugnumber="https://github.com/llvm/llvm-project/issues/191459"
diff --git a/lldb/test/API/test_utils/pdb/TestPdb.py b/lldb/test/API/test_utils/pdb/TestPdb.py
index 7475759324a8d..d3e98c6f52b3f 100644
--- a/lldb/test/API/test_utils/pdb/TestPdb.py
+++ b/lldb/test/API/test_utils/pdb/TestPdb.py
@@ -7,7 +7,6 @@
 
 
 class TestBuildMethod(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def test(self):
diff --git a/lldb/test/API/types/TestCharType.py b/lldb/test/API/types/TestCharType.py
index 49b692ce36871..c4c9a14b11b22 100644
--- a/lldb/test/API/types/TestCharType.py
+++ b/lldb/test/API/types/TestCharType.py
@@ -8,8 +8,6 @@
 
 
 class CharTypeTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_char_type(self):
         """Test that char-type variables are displayed correctly."""
         self.build_and_run("char.cpp", ["char"], qd=True)
diff --git a/lldb/test/API/types/TestCharTypeExpr.py b/lldb/test/API/types/TestCharTypeExpr.py
index fc1622f08e167..11a1cfec6670a 100644
--- a/lldb/test/API/types/TestCharTypeExpr.py
+++ b/lldb/test/API/types/TestCharTypeExpr.py
@@ -8,8 +8,6 @@
 
 
 class CharTypeExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_char_type(self):
         """Test that char-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("char.cpp", ["char"], qd=True)
diff --git a/lldb/test/API/types/TestDoubleTypes.py b/lldb/test/API/types/TestDoubleTypes.py
index b31c82198ee08..fc61c17603739 100644
--- a/lldb/test/API/types/TestDoubleTypes.py
+++ b/lldb/test/API/types/TestDoubleTypes.py
@@ -12,8 +12,6 @@
 
 
 class DoubleTypesTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_double_type(self):
         """Test that double-type variables are displayed correctly."""
         self.build_and_run("double.cpp", set(["double"]))
diff --git a/lldb/test/API/types/TestDoubleTypesExpr.py b/lldb/test/API/types/TestDoubleTypesExpr.py
index ff0bc8cd58f6d..2c8bfe9511a8b 100644
--- a/lldb/test/API/types/TestDoubleTypesExpr.py
+++ b/lldb/test/API/types/TestDoubleTypesExpr.py
@@ -12,8 +12,6 @@
 
 
 class DoubleTypesExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?
diff --git a/lldb/test/API/types/TestFloatTypes.py b/lldb/test/API/types/TestFloatTypes.py
index e1e244d98a41c..26e7b5e8c9f7a 100644
--- a/lldb/test/API/types/TestFloatTypes.py
+++ b/lldb/test/API/types/TestFloatTypes.py
@@ -12,8 +12,6 @@
 
 
 class FloatTypesTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_float_type(self):
         """Test that float-type variables are displayed correctly."""
         self.build_and_run("float.cpp", set(["float"]))
diff --git a/lldb/test/API/types/TestFloatTypesExpr.py b/lldb/test/API/types/TestFloatTypesExpr.py
index fc5f6d8661b4e..a3d5b119692dd 100644
--- a/lldb/test/API/types/TestFloatTypesExpr.py
+++ b/lldb/test/API/types/TestFloatTypesExpr.py
@@ -12,8 +12,6 @@
 
 
 class FloatTypesExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     # rdar://problem/8493023
     # test/types failures for Test*TypesExpr.py: element offset computed wrong
     # and sign error?
diff --git a/lldb/test/API/types/TestIntegerType.py b/lldb/test/API/types/TestIntegerType.py
index be197e5512dcc..76314de385e21 100644
--- a/lldb/test/API/types/TestIntegerType.py
+++ b/lldb/test/API/types/TestIntegerType.py
@@ -8,8 +8,6 @@
 
 
 class IntegerTypesTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_int_type(self):
         """Test that int-type variables are displayed correctly."""
         self.build_and_run("int.cpp", ["int"])
diff --git a/lldb/test/API/types/TestIntegerTypeExpr.py b/lldb/test/API/types/TestIntegerTypeExpr.py
index 85a15f38666dd..d7c81d53ae941 100644
--- a/lldb/test/API/types/TestIntegerTypeExpr.py
+++ b/lldb/test/API/types/TestIntegerTypeExpr.py
@@ -8,8 +8,6 @@
 
 
 class IntegerTypeExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @requireDarwin
     def test_unsigned_short_type_from_block(self):
         """Test that 'unsigned short'-type variables are displayed correctly from a block."""
diff --git a/lldb/test/API/types/TestLongTypes.py b/lldb/test/API/types/TestLongTypes.py
index b0f0c71c1ebf4..f13b57dfa8a01 100644
--- a/lldb/test/API/types/TestLongTypes.py
+++ b/lldb/test/API/types/TestLongTypes.py
@@ -8,8 +8,6 @@
 
 
 class LongTypesTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_long_type(self):
         """Test that long-type variables are displayed correctly."""
         self.build_and_run("long.cpp", ["long"])
diff --git a/lldb/test/API/types/TestLongTypesExpr.py b/lldb/test/API/types/TestLongTypesExpr.py
index 007ee248702b6..6f57edc085fef 100644
--- a/lldb/test/API/types/TestLongTypesExpr.py
+++ b/lldb/test/API/types/TestLongTypesExpr.py
@@ -8,8 +8,6 @@
 
 
 class LongTypesExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_long_type(self):
         """Test that long-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("long.cpp", ["long"])
diff --git a/lldb/test/API/types/TestRecursiveTypes.py b/lldb/test/API/types/TestRecursiveTypes.py
index b3ca0468d3260..79bb008e3c923 100644
--- a/lldb/test/API/types/TestRecursiveTypes.py
+++ b/lldb/test/API/types/TestRecursiveTypes.py
@@ -8,7 +8,6 @@
 
 
 class RecursiveTypesTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     def setUp(self):
diff --git a/lldb/test/API/types/TestShortType.py b/lldb/test/API/types/TestShortType.py
index e073797a09158..5e7433cd3fe70 100644
--- a/lldb/test/API/types/TestShortType.py
+++ b/lldb/test/API/types/TestShortType.py
@@ -8,8 +8,6 @@
 
 
 class ShortTypeTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_short_type(self):
         """Test that short-type variables are displayed correctly."""
         self.build_and_run("short.cpp", ["short"])
diff --git a/lldb/test/API/types/TestShortTypeExpr.py b/lldb/test/API/types/TestShortTypeExpr.py
index c4420f5bc5092..71ee09caa0263 100644
--- a/lldb/test/API/types/TestShortTypeExpr.py
+++ b/lldb/test/API/types/TestShortTypeExpr.py
@@ -8,8 +8,6 @@
 
 
 class ShortExprTestCase(AbstractBase.GenericTester):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     def test_short_type(self):
         """Test that short-type variable expressions are evaluated correctly."""
         self.build_and_run_expr("short.cpp", ["short"])
diff --git a/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py b/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
index 84795bd0ab823..5d51e0bd6b1ee 100644
--- a/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
+++ b/lldb/test/API/windows/launch/missing-dll/TestMissingDll.py
@@ -6,8 +6,6 @@
 
 @skipIfTargetDoesNotSupportSharedLibraries()
 class MissingDllTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @requireWindows
     def test(self):
         """
diff --git a/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py b/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
index c39834b28d148..14000a1cd137f 100644
--- a/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
+++ b/lldb/test/API/windows/launch/replace-dll/TestReplaceDLL.py
@@ -8,7 +8,6 @@
 
 
 class ReplaceDllTestCase(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
     SHARED_BUILD_TESTCASE = False
 
     @requireWindows
diff --git a/lldb/test/API/windows/thread/TestThreadName.py b/lldb/test/API/windows/thread/TestThreadName.py
index 042cd7df8c884..7680790a6d49f 100644
--- a/lldb/test/API/windows/thread/TestThreadName.py
+++ b/lldb/test/API/windows/thread/TestThreadName.py
@@ -9,8 +9,6 @@
 
 
 class TestThreadName(TestBase):
-    TEST_WITH_PDB_DEBUG_INFO = True
-
     @requireWindows
     @skipIfWindows(windows_version=["<", "10.0.14393"])
     def test_with_thread_description(self):

>From bc86a38fa58b3b5e8bac9dd8cd223c3e7a82f00a Mon Sep 17 00:00:00 2001
From: Charles Zablit <c_zablit at apple.com>
Date: Mon, 12 Oct 2026 12:15:12 +0100
Subject: [PATCH 3/3] fixup! [lldb][test] Make pdb a default debug info
 category

---
 lldb/test/API/functionalities/target_var/TestTargetVar.py     | 1 -
 lldb/test/API/lang/c/strings/TestCStrings.py                  | 1 +
 lldb/test/API/lang/cpp/class_static/TestStaticVariables.py    | 2 --
 .../TestConstStaticIntegralMember.py                          | 1 -
 lldb/test/API/python_api/target/TestTargetAPI.py              | 4 ----
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lldb/test/API/functionalities/target_var/TestTargetVar.py b/lldb/test/API/functionalities/target_var/TestTargetVar.py
index f82e4ca8be6ce..0aa09b5856a71 100644
--- a/lldb/test/API/functionalities/target_var/TestTargetVar.py
+++ b/lldb/test/API/functionalities/target_var/TestTargetVar.py
@@ -14,7 +14,6 @@ class targetCommandTestCase(TestBase):
     @skipIfDarwinEmbedded  # needs x86_64
     @skipIf(debug_info="gmodules")  # not relevant
     @skipIf(compiler="clang", compiler_version=["<", "7.0"])
-    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def testTargetVarExpr(self):
         self.build()
         lldbutil.run_to_name_breakpoint(self, "main")
diff --git a/lldb/test/API/lang/c/strings/TestCStrings.py b/lldb/test/API/lang/c/strings/TestCStrings.py
index 1198689c6b981..c81e1a1c56114 100644
--- a/lldb/test/API/lang/c/strings/TestCStrings.py
+++ b/lldb/test/API/lang/c/strings/TestCStrings.py
@@ -7,6 +7,7 @@
 from lldbsuite.test import lldbutil
 
 
+ at expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
 @requireExpressionEvaluation
 class CStringsTestCase(TestBase):
     def test_with_run_command(self):
diff --git a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
index 97ff517a97625..efd0a9159ea32 100644
--- a/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/API/lang/cpp/class_static/TestStaticVariables.py
@@ -17,7 +17,6 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
-    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command(self):
         """Test that file and class static variables display correctly."""
         self.build()
@@ -64,7 +63,6 @@ def test_with_run_command(self):
     @expectedFailureAll(
         compiler=["clang"], compiler_version=["<", "3.9"], bugnumber="llvm.org/pr20550"
     )
-    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_with_run_command_complete(self):
         """
         Test that file and class static variables display correctly with
diff --git a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
index cf9d4d23f609a..5f4abb1172824 100644
--- a/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
+++ b/lldb/test/API/lang/cpp/const_static_integral_member/TestConstStaticIntegralMember.py
@@ -12,7 +12,6 @@ class TestCase(TestBase):
     SHARED_BUILD_TESTCASE = False
 
     @requireExpressionEvaluation
-    @skipIf(debug_info=["pdb"], bugnumber="llvm.org/pr149498")  # Asserts in CodeGen
     def test(self):
         self.build()
         lldbutil.run_to_source_breakpoint(
diff --git a/lldb/test/API/python_api/target/TestTargetAPI.py b/lldb/test/API/python_api/target/TestTargetAPI.py
index 101a04a6bf3a7..e5e16c5f96d0c 100644
--- a/lldb/test/API/python_api/target/TestTargetAPI.py
+++ b/lldb/test/API/python_api/target/TestTargetAPI.py
@@ -30,7 +30,6 @@ def setUp(self):
     #
     # It does not segfaults now.  But for dwarf, the variable value is None if
     # the inferior process does not exist yet.  The radar has been updated.
-    @expectedFailureAll(debug_info=["pdb"], bugnumber="llvm.org/pr149498")
     def test_find_global_variables(self):
         """Exercise SBTarget.FindGlobalVariables() API."""
         d = {"EXE": "b.out"}
@@ -58,9 +57,6 @@ def test_get_description(self):
         self.build()
         self.get_description()
 
-    @expectedFailureAll(
-        oslist=["windows"], debug_info=no_match(["pdb"]), bugnumber="llvm.org/pr21765"
-    )
     def test_resolve_symbol_context_with_address(self):
         """Exercise SBTarget.ResolveSymbolContextForAddress() API."""
         self.build()



More information about the lldb-commits mailing list