diff --git a/test/selenium/home/change_todo_context_to_zero_item_context.rsel b/test/selenium/home/change_todo_context_to_zero_item_context.rsel
index 4ada1ad3..807dff68 100644
--- a/test/selenium/home/change_todo_context_to_zero_item_context.rsel
+++ b/test/selenium/home/change_todo_context_to_zero_item_context.rsel
@@ -8,4 +8,4 @@ click "submit_todo_12"
 wait_for_element_not_present "css=#c1 #todo_12"
 wait_for_visible "c4"
 wait_for_visible "css=#c4 #todo_12"
-assert_not_visible "c4empty-nd"
+wait_for_not_visible "c4empty-nd"
diff --git a/test/selenium/home/create_first_todo.rsel b/test/selenium/home/create_first_todo.rsel
index 05b323e1..5a52f41f 100644
--- a/test/selenium/home/create_first_todo.rsel
+++ b/test/selenium/home/create_first_todo.rsel
@@ -5,5 +5,5 @@ assert_context_count_incremented do
   type "todo_description", "a new action"
   type "todo_context_name", "Brand new context"
   click "css=#todo-form-new-action .submit_box button"
-  assert_confirmation "New context \"Brand new context\" will be also created. Are you sure?"
+  assert_confirmation "New context 'Brand new context' will be also created. Are you sure?"
 end
diff --git a/test/selenium/home/create_new_todo_with_new_action_and_new_context.rsel b/test/selenium/home/create_new_todo_with_new_action_and_new_context.rsel
index 97acb99f..324b5d1a 100644
--- a/test/selenium/home/create_new_todo_with_new_action_and_new_context.rsel
+++ b/test/selenium/home/create_new_todo_with_new_action_and_new_context.rsel
@@ -6,5 +6,5 @@ assert_context_count_incremented do
   type "todo_project_name", "pppp"
   type "todo_context_name", "cccc"
   click "css=#todo-form-new-action .submit_box button"
-  assert_confirmation "New context \"cccc\" will be also created. Are you sure?"
+  assert_confirmation "New context 'cccc' will be also created. Are you sure?"
 end
diff --git a/test/selenium/home/create_new_todo_with_new_context.rsel b/test/selenium/home/create_new_todo_with_new_context.rsel
index 23924577..c2f2c6ed 100644
--- a/test/selenium/home/create_new_todo_with_new_context.rsel
+++ b/test/selenium/home/create_new_todo_with_new_context.rsel
@@ -5,5 +5,5 @@ assert_context_count_incremented do
   type "todo_description", "a new action"
   type "todo_context_name", "Brand new context"
   click "css=#todo-form-new-action .submit_box button"
-  assert_confirmation "New context \"Brand new context\" will be also created. Are you sure?"
+  assert_confirmation "New context 'Brand new context' will be also created. Are you sure?"
 end
diff --git a/test/selenium/home/defer_todo_with_button_empty_context.rsel b/test/selenium/home/defer_todo_with_button_empty_context.rsel
index ede74b2a..b826400e 100644
--- a/test/selenium/home/defer_todo_with_button_empty_context.rsel
+++ b/test/selenium/home/defer_todo_with_button_empty_context.rsel
@@ -1,8 +1,8 @@
 setup :fixtures => :all
 login :as => 'admin'
 open "/"
-wait_for_element_present '//div[@id="line_todo_5"]//img[@alt="Defer 1 day"]/..'
-click '//div[@id="line_todo_5"]//img[@alt="Defer 1 day"]/..'
+wait_for_element_present '//div[@id="line_todo_5"]//img[@alt="Defer one day"]/..'
+click '//div[@id="line_todo_5"]//img[@alt="Defer one day"]/..'
 wait_for_element_not_present "todo_5"
 assert_text 'badge_count', '10'
 wait_for_not_visible "c5"
diff --git a/test/selenium/home/mark_todo_incomplete.rsel b/test/selenium/home/mark_todo_incomplete.rsel
index 1ca103c5..150d7a0f 100644
--- a/test/selenium/home/mark_todo_incomplete.rsel
+++ b/test/selenium/home/mark_todo_incomplete.rsel
@@ -3,4 +3,4 @@ login :as => 'admin'
 open '/'
 click "xpath=//div[@id='completed_container'] //div[@id='todo_3'] //input[@class='item-checkbox']"
 wait_for_element_present "xpath=//div[@id='c4'] //div[@id='todo_3']"
-assert_not_visible "c4empty-nd"
+wait_for_not_visible "c4empty-nd"
diff --git a/test/selenium/tickler/change_deferred_todo_context.rsel b/test/selenium/tickler/change_deferred_todo_context.rsel
index 31bfa5e4..03e978ce 100644
--- a/test/selenium/tickler/change_deferred_todo_context.rsel
+++ b/test/selenium/tickler/change_deferred_todo_context.rsel
@@ -8,5 +8,5 @@ click "submit_todo_15"
 wait_for_element_not_present "css=#c6 #todo_15"
 wait_for_visible "c5"
 wait_for_visible "css=#c5 #todo_15"
-assert_not_visible "c5empty-nd"
+wait_for_not_visible "c5empty-nd"
 wait_for_not_visible "c6"
diff --git a/test/selenium/tickler/create_deferred_todo_with_existing_context.rsel b/test/selenium/tickler/create_deferred_todo_with_existing_context.rsel
index 8f7fccb8..79638a49 100644
--- a/test/selenium/tickler/create_deferred_todo_with_existing_context.rsel
+++ b/test/selenium/tickler/create_deferred_todo_with_existing_context.rsel
@@ -7,7 +7,7 @@ assert_context_count_incremented do
   type "todo_project_name", "None"
   type "todo_show_from", "1/1/2030"
   click "css=#todo-form-new-action .submit_box button"
-  assert_confirmation "New context \"errands\" will be also created. Are you sure?"
+  assert_confirmation "New context 'errands' will be also created. Are you sure?"
 end
 wait_for_not_visible "tickler-empty-nd"
 wait_for_element_present "css=div.item-container a[title=01/01/2030]"