diff --git a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 8729d19cd46f..71e95ea96fb3 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
@@ -18,6 +18,7 @@ class CreateDuringInstructionStepTestCase(TestBase):
         TestBase.setUp(self)
 
     @skipUnlessPlatform(['linux'])
+    @expectedFlakeyAndroid('llvm.org/pr24737', archs=['arm'])
     @dwarf_test
     def test_step_inst_with_dwarf(self):
         self.buildDwarf(dictionary=self.getBuildFlags())
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 7a0b706384c7..11949865349f 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -789,6 +789,9 @@ def expectedFlakeyClang(bugnumber=None, compiler_version=None):
 def expectedFlakeyGcc(bugnumber=None, compiler_version=None):
     return expectedFlakeyCompiler('gcc', compiler_version, bugnumber)
 
+def expectedFlakeyAndroid(bugnumber=None, api_levels=None, archs=None):
+    return expectedFlakey(matchAndroid(api_levels, archs), bugnumber)
+
 def skipIfRemote(func):
     """Decorate the item to skip tests if testing remotely."""
     if isinstance(func, type) and issubclass(func, unittest2.TestCase):