6 files changed, 8 insertions, 8 deletions
diff --git a/lldb/test/dead-strip/TestDeadStrip.py b/lldb/test/dead-strip/TestDeadStrip.py
index 0840fd35af9..b87dd569b7b 100644
--- a/lldb/test/dead-strip/TestDeadStrip.py
+++ b/lldb/test/dead-strip/TestDeadStrip.py
@@ -7,7 +7,7 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestDeadStrip(lldbtest.TestBase):
 
     mydir = "dead-strip"
 
diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/function_types/TestFunctionTypes.py
index 5025d486544..015feec8083 100644
--- a/lldb/test/function_types/TestFunctionTypes.py
+++ b/lldb/test/function_types/TestFunctionTypes.py
@@ -5,7 +5,7 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestFunctionTypes(lldbtest.TestBase):
 
     mydir = "function_types"
 
diff --git a/lldb/test/global_variables/TestGlobalVariables.py b/lldb/test/global_variables/TestGlobalVariables.py
index 854a1b7ba24..2701df98f8d 100644
--- a/lldb/test/global_variables/TestGlobalVariables.py
+++ b/lldb/test/global_variables/TestGlobalVariables.py
@@ -5,7 +5,7 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestGlobalVariables(lldbtest.TestBase):
 
     mydir = "global_variables"
 
diff --git a/lldb/test/load_unload/TestLoadUnload.py b/lldb/test/load_unload/TestLoadUnload.py
index 13c6d0e9622..5547e9c8e2a 100644
--- a/lldb/test/load_unload/TestLoadUnload.py
+++ b/lldb/test/load_unload/TestLoadUnload.py
@@ -7,11 +7,11 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestLoadUnload(lldbtest.TestBase):
 
     mydir = "load_unload"
 
-    def test_dead_strip(self):
+    def test_load_unload(self):
         """Test breakpoint by name works correctly with dlopen'ing."""
         res = self.res
         exe = os.path.join(os.getcwd(), "a.out")
diff --git a/lldb/test/order/TestOrder.py b/lldb/test/order/TestOrder.py
index 85a1d86196b..6c2e2a77124 100644
--- a/lldb/test/order/TestOrder.py
+++ b/lldb/test/order/TestOrder.py
@@ -8,7 +8,7 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestOrder(lldbtest.TestBase):
 
     mydir = "order"
 
diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/set_values/TestSetValues.py
index 757d65e9417..b17cf4a2512 100644
--- a/lldb/test/set_values/TestSetValues.py
+++ b/lldb/test/set_values/TestSetValues.py
@@ -5,11 +5,11 @@ import unittest
 import lldb
 import lldbtest
 
-class TestClassTypes(lldbtest.TestBase):
+class TestSetValues(lldbtest.TestBase):
 
     mydir = "set_values"
 
-    def test_class_types(self):
+    def test_set_values(self):
         """Test settings and readings of program variables."""
         res = self.res
         exe = os.path.join(os.getcwd(), "a.out")