diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index df31648..53aa4b5 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -8,19 +8,17 @@
     mydir = TestBase.compute_mydir(__file__)
 
     @debugserver_test
-    @dsym_test
-    def test_single_step_only_steps_one_instruction_with_s_debugserver_dsym(self):
+    def test_single_step_only_steps_one_instruction_with_s_debugserver(self):
         self.init_debugserver_test()
-        self.buildDsym()
+        self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(use_Hc_packet=True, step_instruction="s")
 
     @llgs_test
-    @dwarf_test
     @expectedFailureAndroid(bugnumber="llvm.com/pr24739", archs=["arm", "aarch64"])
-    def test_single_step_only_steps_one_instruction_with_s_llgs_dwarf(self):
+    def test_single_step_only_steps_one_instruction_with_s_llgs(self):
         self.init_llgs_test()
-        self.buildDwarf()
+        self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(use_Hc_packet=True, step_instruction="s")