Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
@@ -31,6 +31,7 @@
 
     @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
     @expectedFailureWindows("llvm.org/pr24446") # WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows
+    @expectedFailureAll(archs=['mips', 'mipsel', 'mips64', 'mips64el']) # Most of the MIPS boards provide only one H/W watchpoints, and S/W watchpoints are not supported yet
     def test_hello_watchlocation(self):
         """Test watching a location with '-s size' option."""
         self.build(dictionary=self.d)
Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -54,17 +54,6 @@
                         error.GetCString())
         self.assertTrue(read_watchpoint, "Failed to set read watchpoint.")
 
-        write_value = frame.FindValue('g_watch_me_write',
-                                      lldb.eValueTypeVariableGlobal)
-        self.assertTrue(write_value, "Failed to find write value.")
-
-        # resolve_location=True, read=False, write=True
-        write_watchpoint = write_value.Watch(True, False, True, error)
-        self.assertTrue(read_watchpoint, "Failed to set write watchpoint.")
-        self.assertTrue(error.Success(),
-                        "Error while setting watchpoint: %s" %
-                        error.GetCString())
-
         thread.StepOver()
         self.assertTrue(thread.GetStopReason() == lldb.eStopReasonWatchpoint,
                         STOPPED_DUE_TO_WATCHPOINT)
@@ -77,6 +66,22 @@
 
         self.step_inst_for_watchpoint(1)
 
+        write_value = frame.FindValue('g_watch_me_write',
+                                      lldb.eValueTypeVariableGlobal)
+        self.assertTrue(write_value, "Failed to find write value.")
+
+        # Most of the MIPS boards provide only one H/W watchpoints, and S/W watchpoints are not supported yet
+        arch = self.getArchitecture()
+        if arch in ['mips', 'mipsel', 'mips64', 'mips64el']:
+            self.runCmd("watchpoint delete 1")
+
+        # resolve_location=True, read=False, write=True
+        write_watchpoint = write_value.Watch(True, False, True, error)
+        self.assertTrue(read_watchpoint, "Failed to set write watchpoint.")
+        self.assertTrue(error.Success(),
+                        "Error while setting watchpoint: %s" %
+                        error.GetCString())
+
         thread.StepOver()
         self.assertTrue(thread.GetStopReason() == lldb.eStopReasonWatchpoint,
                         STOPPED_DUE_TO_WATCHPOINT)