diff --git a/pylib/gyp/generator/msvs_test.py b/pylib/gyp/generator/test_msvs.py
similarity index 100%
rename from pylib/gyp/generator/msvs_test.py
rename to pylib/gyp/generator/test_msvs.py
diff --git a/pylib/gyp/generator/ninja_test.py b/pylib/gyp/generator/test_ninja.py
similarity index 100%
rename from pylib/gyp/generator/ninja_test.py
rename to pylib/gyp/generator/test_ninja.py
diff --git a/pylib/gyp/generator/xcode_test.py b/pylib/gyp/generator/test_xcode.py
similarity index 100%
rename from pylib/gyp/generator/xcode_test.py
rename to pylib/gyp/generator/test_xcode.py
diff --git a/pylib/gyp/MSVSSettings_test.py b/pylib/gyp/test_MSVSSettings.py
similarity index 100%
rename from pylib/gyp/MSVSSettings_test.py
rename to pylib/gyp/test_MSVSSettings.py
diff --git a/pylib/gyp/common_test.py b/pylib/gyp/test_common.py
similarity index 100%
rename from pylib/gyp/common_test.py
rename to pylib/gyp/test_common.py
diff --git a/pylib/gyp/easy_xml_test.py b/pylib/gyp/test_easy_xml.py
similarity index 100%
rename from pylib/gyp/easy_xml_test.py
rename to pylib/gyp/test_easy_xml.py
diff --git a/pylib/gyp/input_test.py b/pylib/gyp/test_input.py
similarity index 100%
rename from pylib/gyp/input_test.py
rename to pylib/gyp/test_input.py
diff --git a/pylib/gyp/xcode_emulation_test.py b/pylib/gyp/test_xcode_emulation.py
similarity index 100%
rename from pylib/gyp/xcode_emulation_test.py
rename to pylib/gyp/test_xcode_emulation.py
diff --git a/pylib/gyp/xcodeproj_file.py b/pylib/gyp/xcodeproj_file.py
index 4f92cd09..cb4d0d2d 100644
--- a/pylib/gyp/xcodeproj_file.py
+++ b/pylib/gyp/xcodeproj_file.py
@@ -781,7 +781,7 @@ def UpdateProperties(self, properties, do_copy=False):
             # Make sure the property conforms to the schema.
             (is_list, property_type, is_strong) = self._schema[property][0:3]
             if is_list:
-                if not isinstance(value.__class__, list):
+                if not isinstance(value, list):
                     raise TypeError(
                         property
                         + " of "