diff --git a/Library/Homebrew/formula_test.rb b/Library/Homebrew/formula_test.rb
index d61fa113e7..e63b183f4d 100755
--- a/Library/Homebrew/formula_test.rb
+++ b/Library/Homebrew/formula_test.rb
@@ -41,3 +41,12 @@ class FormulaNames <Test::Unit::TestCase
     end
   end
 end
+
+class CommentedTemplateCode <Test::Unit::TestCase
+  def test_for_commented_out_cmake
+    Dir["#{HOMEBREW_PREFIX}/Library/Formula/*.rb"].each do |f|
+      result = `grep "# depends_on 'cmake'" "#{f}"`.strip
+      assert_equal('', result, "Commented template code still in #{f}")
+    end
+  end
+end
\ No newline at end of file