Index: test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
===================================================================
--- test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -16,16 +16,16 @@
     @dsym_test
     def test_watchlocation_with_dsym_using_watchpoint_set(self):
         """Test watching a location with 'watchpoint set expression -w write -s size' option."""
-        self.buildDsym(dictionary=self.d)
-        self.setTearDownCleanup(dictionary=self.d)
+        self.buildDsym()
+        self.setTearDownCleanup()
         self.watchlocation_using_watchpoint_set()
 
     @expectedFailureFreeBSD('llvm.org/pr18832')
     @dwarf_test
     def test_watchlocation_with_dwarf_using_watchpoint_set(self):
         """Test watching a location with 'watchpoint set expression -w write -s size' option."""
-        self.buildDwarf(dictionary=self.d)
-        self.setTearDownCleanup(dictionary=self.d)
+        self.buildDwarf()
+        self.setTearDownCleanup()
         self.watchlocation_using_watchpoint_set()
 
     def setUp(self):
@@ -38,12 +38,10 @@
         # This is for verifying that watch location works.
         self.violating_func = "do_bad_thing_with_location";
         # Build dictionary to have unique executable names for each test method.
-        self.exe_name = self.testMethodName
-        self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
 
     def watchlocation_using_watchpoint_set(self):
         """Test watching a location with '-s size' option."""
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = os.path.join(os.getcwd(), 'a.out')
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
Index: test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
===================================================================
--- test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
+++ test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
@@ -15,8 +15,8 @@
     @expectedFailureFreeBSD('llvm.org/pr18832')
     def test_error_cases_with_watchpoint_set(self):
         """Test error cases with the 'watchpoint set' command."""
-        self.buildDwarf(dictionary=self.d)
-        self.setTearDownCleanup(dictionary=self.d)
+        self.buildDwarf()
+        self.setTearDownCleanup()
         self.error_cases_with_watchpoint_set()
 
     def setUp(self):
@@ -27,12 +27,10 @@
         # Find the line number to break inside main().
         self.line = line_number(self.source, '// Set break point at this line.')
         # Build dictionary to have unique executable names for each test method.
-        self.exe_name = self.testMethodName
-        self.d = {'CXX_SOURCES': self.source, 'EXE': self.exe_name}
 
     def error_cases_with_watchpoint_set(self):
         """Test error cases with the 'watchpoint set' command."""
-        exe = os.path.join(os.getcwd(), self.exe_name)
+        exe = os.path.join(os.getcwd(), 'a.out')
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.