diff --git a/lldb/test/types/TestBasicTypes.py b/lldb/test/types/AbstractBase.py
similarity index 99%
rename from lldb/test/types/TestBasicTypes.py
rename to lldb/test/types/AbstractBase.py
index bb3b153fda54..f80e0b2e7b36 100644
--- a/lldb/test/types/TestBasicTypes.py
+++ b/lldb/test/types/AbstractBase.py
@@ -10,7 +10,7 @@ from lldbtest import *
 def Msg(var, val):
     return "'frame variable %s' matches the compiler's output: %s" % (var, val)
 
-class AbstractBase(TestBase):
+class GenericTester(TestBase):
 
     # This is the pattern by design to match the " var = 'value'" output from
     # printf() stmts (see basic_type.cpp).
diff --git a/lldb/test/types/TestFloatTypes.py b/lldb/test/types/TestFloatTypes.py
index 270fe7d0265a..025c8bc8d126 100644
--- a/lldb/test/types/TestFloatTypes.py
+++ b/lldb/test/types/TestFloatTypes.py
@@ -2,11 +2,11 @@
 Test that variables of floating point types are displayed correctly.
 """
 
-import TestBasicTypes
+import AbstractBase
 import unittest2
 import lldb
 
-class FloatTypesTestCase(TestBasicTypes.AbstractBase):
+class FloatTypesTestCase(AbstractBase.GenericTester):
 
     mydir = "types"
 
diff --git a/lldb/test/types/TestIntegerTypes.py b/lldb/test/types/TestIntegerTypes.py
index 7192777ad71f..a7ac3fcb18fe 100644
--- a/lldb/test/types/TestIntegerTypes.py
+++ b/lldb/test/types/TestIntegerTypes.py
@@ -2,11 +2,11 @@
 Test that variables of integer basic types are displayed correctly.
 """
 
-import TestBasicTypes
+import AbstractBase
 import unittest2
 import lldb
 
-class IntegerTypesTestCase(TestBasicTypes.AbstractBase):
+class IntegerTypesTestCase(AbstractBase.GenericTester):
 
     mydir = "types"