diff --git a/app/controllers/recurring_todos_controller.rb b/app/controllers/recurring_todos_controller.rb
index 365aa767..841f807f 100644
--- a/app/controllers/recurring_todos_controller.rb
+++ b/app/controllers/recurring_todos_controller.rb
@@ -157,7 +157,7 @@ class RecurringTodosController < ApplicationController
       :recurring_show_always, :weekly_every_x_week, :weekly_return_monday,
       :yearly_day_of_week, :yearly_every_x_day, :yearly_every_xth_day,
       :yearly_month_of_year2, :yearly_month_of_year,
-      # derived attribues
+      # derived attributes
       :weekly_return_monday, :weekly_return_tuesday, :weekly_return_wednesday,
       :weekly_return_thursday, :weekly_return_friday, :weekly_return_saturday, :weekly_return_sunday
       )
diff --git a/features/logging_in.feature b/features/logging_in.feature
index 2f2e86e3..63a00db8 100644
--- a/features/logging_in.feature
+++ b/features/logging_in.feature
@@ -9,7 +9,7 @@ Feature: Existing user logging in
       | testuser | secret   | false    | Test       | User      |
       | admin    | secret   | true     | Admin      | User      |
 
-  Scenario Outline: Succesfull and unsuccesfull login
+  Scenario Outline: Successful and unsuccessful login
     When I go to the login page
     And I submit the login form as user "<user>" with password "<password>"
     Then I should be <there>
diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb
index fcde26dd..099198a0 100644
--- a/test/controllers/todos_controller_test.rb
+++ b/test/controllers/todos_controller_test.rb
@@ -776,7 +776,7 @@ class TodosControllerTest < ActionController::TestCase
     todo = Todo.find(todo.id) #reload does not seem to work here
     assert todo.completed?
 
-    # Then there should not be an active todo beloning to the repeat pattern
+    # Then there should not be an active todo belonging to the repeat pattern
     next_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'active').first
     assert next_todo.nil?
 
@@ -814,7 +814,7 @@ class TodosControllerTest < ActionController::TestCase
     todo.reload
     assert todo.completed?
 
-    # Then there should not be an active todo beloning to the repeat pattern
+    # Then there should not be an active todo belonging to the repeat pattern
     next_todo = Todo.where(:recurring_todo_id => recurring_todo.id, :state => 'active').first
     assert next_todo.nil?
 
diff --git a/test/models/recurring_todo_test.rb b/test/models/recurring_todo_test.rb
index 4e145f67..88be28a4 100644
--- a/test/models/recurring_todo_test.rb
+++ b/test/models/recurring_todo_test.rb
@@ -29,7 +29,7 @@ class RecurringTodoTest < ActiveSupport::TestCase
     # assume that target due_date works fine, i.e. don't do the same tests over
 
     @every_day.target='show_from_date'
-    # when recurrence is targeted on show_from, due date shoult remain nil
+    # when recurrence is targeted on show_from, due date should remain nil
     assert_equal nil, @every_day.get_due_date(nil)
     assert_equal nil, @every_day.get_due_date(@today-3.days)
 
diff --git a/test/models/recurring_todos/yearly_repeat_pattern_test.rb b/test/models/recurring_todos/yearly_repeat_pattern_test.rb
index 7030ebf8..07f10b72 100644
--- a/test/models/recurring_todos/yearly_repeat_pattern_test.rb
+++ b/test/models/recurring_todos/yearly_repeat_pattern_test.rb
@@ -30,7 +30,7 @@ module RecurringTodos
       assert builder.save, "should save: #{builder.errors.full_messages}"
       rt = builder.saved_recurring_todo
 
-      assert builder.pattern.is_a?(YearlyRepeatPattern), "should be monthly pattern, but is #{builder.pattern.class}"
+      assert builder.pattern.is_a?(YearlyRepeatPattern), "should be yearly pattern, but is #{builder.pattern.class}"
 
       assert_equal rt.recurrence_selector, builder.pattern.recurrence_selector
       assert_equal rt.every_other2,        builder.pattern.month_of_year