diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index 9226edf..8b10425 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1544,7 +1544,7 @@ class CmsControllerTest < Test::Unit::TestCase
   # making some adjustments.
   def parse_json_response
     eval(@response.body.gsub('":', '"=>').gsub('null', 'nil'))
-    ed
+  end
 
   should 'make RawHTMLArticle available only to environment admins' do
     @controller.stubs(:profile).returns(profile)
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index ceedc28..dae3784 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class CommentTest < Test::Unit::TestCase
 
+  def setup
+    Comment.skip_captcha!
+  end
+
   should 'have a name and require it' do
     assert_mandatory(Comment.new, :title)
   end
@@ -328,6 +332,7 @@ class CommentTest < Test::Unit::TestCase
   end
 
   should 'have the captcha_solution be solved' do
+    Comment.dont_skip_captcha!
     c = Comment.new
     assert !c.valid? && c.errors.invalid?(:captcha_solution)
     c.skip_captcha!
--
libgit2 0.21.2