diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py
index 021b84386821ef6dbe2339dece7711aa11671968..982e6812e6172647d249f6ba4fcdea8e5bdd5169 100755
--- a/tools/buildgen/plugins/generate_vsprojects.py
+++ b/tools/buildgen/plugins/generate_vsprojects.py
@@ -6,9 +6,6 @@ and "vsproject_dict", to be used by the visual studio generators.
 """
 
 
-import re
-
-
 def mako_plugin(dictionary):
   """The exported plugin code for generate_vsprojeccts
 
@@ -27,10 +24,13 @@ def mako_plugin(dictionary):
   projects = []
   projects.extend(libs)
   projects.extend(targets)
-  projects = [project for project in projects if project.get('vs_project_guid', None)]
+  # Exclude projects without a visual project guid, such as the tests.
+  projects = [project for project in projects
+                if project.get('vs_project_guid', None)]
 
-  ## Exclude C++ projects for now
-  projects = [project for project in projects if not project.language == 'c++']
+  # Exclude C++ projects for now
+  projects = [project for project in projects
+                if not project['language'] == 'c++']
 
   project_dict = dict([(p['name'], p) for p in projects])