diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
index 6002d457731735c4a6453e11c262c58d8cb138cc..5cb8eeb2ca25b840e776c6c654a004436901d171 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -60,8 +60,7 @@ class HelloWatchpointTestCase(TestBase):
         # There should be only one watchpoint hit (see main.c).
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
index efefce95f36100fc3f2228038b351edcc7aa4468..2dcbe65d3e116f51597f96ea18fd8af0b138a359 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
@@ -113,8 +113,7 @@ class WatchpointCommandsTestCase(TestBase):
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -170,8 +169,7 @@ class WatchpointCommandsTestCase(TestBase):
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Delete the watchpoint immediately, but set auto-confirm to true first.
         self.runCmd("settings set auto-confirm true")
@@ -213,8 +211,7 @@ class WatchpointCommandsTestCase(TestBase):
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Set the ignore count of the watchpoint immediately.
         self.expect("watchpoint ignore -i 2",
@@ -260,8 +257,7 @@ class WatchpointCommandsTestCase(TestBase):
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -320,8 +316,7 @@ class WatchpointCommandsTestCase(TestBase):
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Immediately, we disable the watchpoint.  We won't be stopping due to a
         # watchpoint after this.
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index e5de8f88749e4e48bd7fd45f8a80a7291f8e2530..4f7168ab4f145dbe2a1a98c82d78e5336c499db7 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -60,8 +60,7 @@ class WatchpointConditionCmdTestCase(TestBase):
         # With a condition of 'global==5'.
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         self.runCmd("watchpoint modify -c 'global==5'")