diff --git a/test/ui/base.rb b/test/ui/base.rb
index fa877ec7b..fc394c09a 100644
--- a/test/ui/base.rb
+++ b/test/ui/base.rb
@@ -34,7 +34,7 @@ Capybara.register_driver :selenium do |app|
 end
 
 # default: 2
-Capybara.default_wait_time = 20
+Capybara.default_wait_time = 2
 
 DatabaseCleaner.strategy = :truncation
 
diff --git a/test/ui/issues_test.rb b/test/ui/issues_test.rb
index c06422781..aeb47e8be 100644
--- a/test/ui/issues_test.rb
+++ b/test/ui/issues_test.rb
@@ -33,7 +33,6 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       fill_in 'Description', :with => 'new issue'
       select '0 %', :from => 'Done'
       fill_in 'Due date', :with => ''
-      select '', :from => 'Assignee'
       fill_in 'Searchable field', :with => 'Value for field 2'
       # click_button 'Create' would match both 'Create' and 'Create and continue' buttons
       find('input[name=commit]').click
@@ -200,7 +199,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
     visit '/issues/1'
     assert page.has_no_content?('Form update CF')
 
-    page.first(:link, 'Update').click
+    page.first(:link, 'Edit').click
     # the custom field should show up when changing tracker
     select 'Feature request', :from => 'Tracker'
     assert page.has_content?('Form update CF')