2 files changed, 5 insertions, 20 deletions
diff --git a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
index 0d360e472f7..f00ada5040a 100644
--- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
@@ -22,6 +22,7 @@ class PluginCommandTestCase(TestBase):
     @skipIfNoSBHeaders
     @skipIfHostIncompatibleWithRemote # Requires a compatible arch and platform to link against the host's built lldb lib.
     @expectedFailureWindows("llvm.org/pr24778")
+    @no_debug_info_test
     def test_load_plugin(self):
         """Test that plugins that load commands work correctly."""
 
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
index 16feb5f85a2..d4b1b5f47c8 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
+++ b/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
@@ -13,30 +13,14 @@ class PluginPythonOSPlugin(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_python_os_plugin_dsym(self):
+    def test_python_os_plugin(self):
         """Test that the Python operating system plugin works correctly"""
-        self.buildDsym()
+        self.build()
         self.run_python_os_funcionality()
 
-    @dwarf_test
-    def test_python_os_plugin_dwarf(self):
-        """Test that the Python operating system plugin works correctly"""
-        self.buildDwarf()
-        self.run_python_os_funcionality()
-
-    @skipUnlessDarwin
-    @dsym_test
-    def test_python_os_step_dsym(self):
-        """Test that the Python operating system plugin works correctly when single stepping a virtual thread"""
-        self.buildDsym()
-        self.run_python_os_step()
-
-    @dwarf_test
-    def run_python_os_step_dwarf(self):
+    def run_python_os_step(self):
         """Test that the Python operating system plugin works correctly when single stepping a virtual thread"""
-        self.buildDwarf()
+        self.build()
         self.run_python_os_step()
 
     def verify_os_thread_registers(self, thread):