diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/array_types/TestArrayTypes.py
index a638e7487939..d7b1d5be24f0 100644
--- a/lldb/test/array_types/TestArrayTypes.py
+++ b/lldb/test/array_types/TestArrayTypes.py
@@ -32,7 +32,8 @@ class ArrayTypesTestCase(TestBase):
         self.array_types_python()
 
     def setUp(self):
-        super(ArrayTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/bitfields/TestBitfields.py b/lldb/test/bitfields/TestBitfields.py
index 2a10e7fd07f3..6d169d3551c1 100644
--- a/lldb/test/bitfields/TestBitfields.py
+++ b/lldb/test/bitfields/TestBitfields.py
@@ -32,7 +32,8 @@ class BitfieldsTestCase(TestBase):
         self.bitfields_variable_python()
 
     def setUp(self):
-        super(BitfieldsTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/breakpoint_command/TestBreakpointCommand.py b/lldb/test/breakpoint_command/TestBreakpointCommand.py
index 600f6097afa4..451c3444c84f 100644
--- a/lldb/test/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/breakpoint_command/TestBreakpointCommand.py
@@ -27,7 +27,8 @@ class BreakpointCommandTestCase(TestBase):
         self.breakpoint_command_sequence()
 
     def setUp(self):
-        super(BreakpointCommandTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/breakpoint_locations/TestBreakpointLocations.py
index 214682d51ce4..b71036649af0 100644
--- a/lldb/test/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/breakpoint_locations/TestBreakpointLocations.py
@@ -23,7 +23,8 @@ class BreakpointLocationsTestCase(TestBase):
         self.breakpoint_locations_test()
 
     def setUp(self):
-        super(BreakpointLocationsTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/class_types/TestClassTypes.py
index 1749b99955bb..4315e56f394f 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/class_types/TestClassTypes.py
@@ -47,7 +47,8 @@ class ClassTypesTestCase(TestBase):
         self.class_types_expr_parser()
 
     def setUp(self):
-        super(ClassTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break for main.cpp.
         self.line = line_number('main.cpp', '// Set break point at this line.')
 
diff --git a/lldb/test/class_types/TestClassTypesDisassembly.py b/lldb/test/class_types/TestClassTypesDisassembly.py
index 779ecf7928d3..74dc3e00516b 100644
--- a/lldb/test/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/class_types/TestClassTypesDisassembly.py
@@ -34,7 +34,8 @@ class IterateFrameAndDisassembleTestCase(TestBase):
         self.disassemble_call_stack_api()
 
     def setUp(self):
-        super(IterateFrameAndDisassembleTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break for main.cpp.
         self.line = line_number('main.cpp', '// Set break point at this line.')
 
diff --git a/lldb/test/enum_types/TestEnumTypes.py b/lldb/test/enum_types/TestEnumTypes.py
index a16a69f2f433..bea2c0cab84b 100644
--- a/lldb/test/enum_types/TestEnumTypes.py
+++ b/lldb/test/enum_types/TestEnumTypes.py
@@ -23,7 +23,8 @@ class EnumTypesTestCase(TestBase):
         self.image_lookup_for_enum_type()
 
     def setUp(self):
-        super(EnumTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/foundation/TestObjCMethods.py b/lldb/test/foundation/TestObjCMethods.py
index 7e76cab8f5ab..b9ac8a5828ca 100644
--- a/lldb/test/foundation/TestObjCMethods.py
+++ b/lldb/test/foundation/TestObjCMethods.py
@@ -85,7 +85,8 @@ class FoundationTestCase(TestBase):
             substrs = ["Foundation`-[NSAutoreleasePool release]"])
 
     def setUp(self):
-        super(FoundationTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.m', '// Set break point at this line.')
 
diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/function_types/TestFunctionTypes.py
index 8d856ab3190d..524c57c087c5 100644
--- a/lldb/test/function_types/TestFunctionTypes.py
+++ b/lldb/test/function_types/TestFunctionTypes.py
@@ -21,7 +21,8 @@ class FunctionTypesTestCase(TestBase):
         self.function_types()
 
     def setUp(self):
-        super(FunctionTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/global_variables/TestGlobalVariables.py b/lldb/test/global_variables/TestGlobalVariables.py
index 239885df2f89..a913ef00f184 100644
--- a/lldb/test/global_variables/TestGlobalVariables.py
+++ b/lldb/test/global_variables/TestGlobalVariables.py
@@ -21,7 +21,8 @@ class GlobalVariablesTestCase(TestBase):
         self.global_variables()
 
     def setUp(self):
-        super(GlobalVariablesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/test/macosx/universal/TestUniversal.py
index 935cf30303fc..17f5e7022243 100644
--- a/lldb/test/macosx/universal/TestUniversal.py
+++ b/lldb/test/macosx/universal/TestUniversal.py
@@ -10,7 +10,8 @@ class UniversalTestCase(TestBase):
     mydir = "macosx/universal"
 
     def setUp(self):
-        super(UniversalTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', '// Set break point at this line.')
 
diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/set_values/TestSetValues.py
index 321cb2c0e2a7..d8b45a21e8cc 100644
--- a/lldb/test/set_values/TestSetValues.py
+++ b/lldb/test/set_values/TestSetValues.py
@@ -21,7 +21,8 @@ class SetValuesTestCase(TestBase):
         self.set_values()
 
     def setUp(self):
-        super(SetValuesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line numbers to break inside main().
         self.line1 = line_number('main.c', '// Set break point #1.')
         self.line2 = line_number('main.c', '// Set break point #2.')
diff --git a/lldb/test/signal/TestSendSignal.py b/lldb/test/signal/TestSendSignal.py
index 3c6b8a7107f9..eda5c1d6bb72 100644
--- a/lldb/test/signal/TestSendSignal.py
+++ b/lldb/test/signal/TestSendSignal.py
@@ -21,7 +21,8 @@ class SendSignalTestCase(TestBase):
         self.send_signal()
 
     def setUp(self):
-        super(SendSignalTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', 'Put breakpoint here')
 
diff --git a/lldb/test/stl/TestSTL.py b/lldb/test/stl/TestSTL.py
index 933a1f9b3941..b489bae2f343 100644
--- a/lldb/test/stl/TestSTL.py
+++ b/lldb/test/stl/TestSTL.py
@@ -23,7 +23,8 @@ class STLTestCase(TestBase):
         self.step_into_stl()
 
     def setUp(self):
-        super(STLTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.cpp', '// Set break point at this line.')
 
diff --git a/lldb/test/stl/TestStdCXXDisassembly.py b/lldb/test/stl/TestStdCXXDisassembly.py
index 95951cef3815..5b3d56a68c48 100644
--- a/lldb/test/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/stl/TestStdCXXDisassembly.py
@@ -12,7 +12,8 @@ class StdCXXDisassembleTestCase(TestBase):
     mydir = "stl"
 
     def setUp(self):
-        super(StdCXXDisassembleTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.cpp', '// Set break point at this line.')
 
diff --git a/lldb/test/struct_types/TestStructTypes.py b/lldb/test/struct_types/TestStructTypes.py
index 88a4d8f0baa2..d5d922a7c5a1 100644
--- a/lldb/test/struct_types/TestStructTypes.py
+++ b/lldb/test/struct_types/TestStructTypes.py
@@ -25,7 +25,8 @@ class StructTypesTestCase(TestBase):
         self.struct_types()
 
     def setUp(self):
-        super(StructTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break for main.c.
         self.line = line_number('main.c', '// Set break point at this line.')
         self.first_executable_line = line_number('main.c',
diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/unsigned_types/TestUnsignedTypes.py
index 426e06c731d1..1f95e8026076 100644
--- a/lldb/test/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/unsigned_types/TestUnsignedTypes.py
@@ -24,7 +24,8 @@ class UnsignedTypesTestCase(TestBase):
         self.unsigned_types()
 
     def setUp(self):
-        super(UnsignedTypesTestCase, self).setUp()
+        # Call super's setUp().
+        TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.cpp', '// Set break point at this line.')