diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 1603dd65..930043a8 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -27,12 +27,12 @@ class IssuesControllerTest < Additionals::ControllerTest
            :queries
 
   def setup
-    manager_role = Role.find(1)
+    manager_role = roles(:roles_001)
     manager_role.add_permission!(:edit_issue_author)
   end
 
   test 'author field as authorized user in new with change' do
-    manager_role = Role.find(1)
+    manager_role = roles(:roles_001)
     manager_role.add_permission!(:change_new_issue_author)
     session[:user_id] = 2
     get :new,
@@ -164,7 +164,7 @@ class IssuesControllerTest < Additionals::ControllerTest
   end
 
   test 'show forbidden status in issue sidebar with permission issue_timelog_never_required' do
-    manager_role = Role.find(2)
+    manager_role = roles(:roles_002)
     manager_role.add_permission!(:issue_timelog_never_required)
 
     with_additionals_settings(issue_change_status_in_sidebar: 1,
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 18d10243..2ba492c4 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -25,7 +25,7 @@ class WikiControllerTest < Additionals::ControllerTest
   def setup
     prepare_tests
     EnabledModule.create(project_id: 1, name: 'wiki')
-    @project = Project.find(1)
+    @project = projects(:projects_001)
     @wiki = @project.wiki
     @page_name = 'additionals_macro_test'
     @page = @wiki.find_or_new_page(@page_name)
@@ -322,7 +322,7 @@ class WikiControllerTest < Additionals::ControllerTest
 
     assert_response :success
     assert_select 'div.wiki', html: /{{date/, count: 0
-    assert_select 'div.wiki span.current-date', count: 9
+    assert_select 'div.wiki span.current-date', count: valid_types.count
     assert_select 'div.wiki span.current-date', User.current.today.cweek.to_s
   end
 
diff --git a/test/unit/helpers/global_helper_test.rb b/test/unit/helpers/global_helper_test.rb
index 6144b1fb..c34ac30b 100644
--- a/test/unit/helpers/global_helper_test.rb
+++ b/test/unit/helpers/global_helper_test.rb
@@ -37,7 +37,7 @@ class GlobalHelperTest < ActionView::TestCase
   end
 
   def test_user_with_avatar
-    html = user_with_avatar(User.find(1))
+    html = user_with_avatar(users(:users_001))
 
     assert_include 'Redmine Admin', html
   end
diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
index baba7ed3..7ba21c8f 100644
--- a/test/unit/time_entry_test.rb
+++ b/test/unit/time_entry_test.rb
@@ -19,14 +19,14 @@ class TimeEntryTest < Additionals::TestCase
   end
 
   def test_create_time_entry_without_issue
-    entry = TimeEntry.new(project: Project.find(1), user: User.find(1), activity: TimeEntryActivity.first, hours: 100)
+    entry = TimeEntry.new(project: projects(:projects_001), user: users(:users_001), activity: TimeEntryActivity.first, hours: 100)
     entry.spent_on = '2010-01-01'
     assert entry.valid?
     assert entry.save
   end
 
   def test_create_time_entry_with_open_issue
-    entry = TimeEntry.new(project: Project.find(1), user: User.find(1), activity: TimeEntryActivity.first, hours: 100)
+    entry = TimeEntry.new(project: projects(:projects_001), user: users(:users_001), activity: TimeEntryActivity.first, hours: 100)
     entry.spent_on = '2010-01-01'
     entry.issue = Issue.create(project_id: 1, tracker_id: 1, author_id: 1, status_id: 1, subject: 'open issue')
     assert_not entry.issue.closed?
@@ -40,7 +40,7 @@ class TimeEntryTest < Additionals::TestCase
     issue.status = IssueStatus.where(is_closed: true).first
     issue.save
 
-    entry = TimeEntry.new(project: Project.find(1), user: User.find(1), activity: TimeEntryActivity.first, hours: 100)
+    entry = TimeEntry.new(project: projects(:projects_001), user: users(:users_001), activity: TimeEntryActivity.first, hours: 100)
     entry.spent_on = '2010-01-01'
     entry.issue = issue
     assert entry.issue.closed?
@@ -49,13 +49,13 @@ class TimeEntryTest < Additionals::TestCase
   end
 
   def test_create_time_entry_with_closed_issue_with_permission
-    User.current = User.find(3)
+    User.current = users(:users_003)
     role = Role.create!(name: 'Additionals Tester', permissions: [:log_time_on_closed_issues])
     Member.where(user_id: User.current).delete_all
-    project = Project.find(1)
+    project = projects(:projects_001)
     Member.create!(principal: User.current, project_id: project.id, role_ids: [role.id])
 
-    entry = TimeEntry.new(project: Project.find(1), user: User.current, activity: TimeEntryActivity.first, hours: 100)
+    entry = TimeEntry.new(project: projects(:projects_001), user: User.current, activity: TimeEntryActivity.first, hours: 100)
     entry.spent_on = '2010-01-01'
     entry.issue = Issue.create(project_id: 1, tracker_id: 1, author_id: 1, status_id: 5, subject: 'closed issue')
     assert entry.issue.closed?
diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index dc668e94..5e9e0a43 100644
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -9,9 +9,9 @@ class WatcherTest < Additionals::TestCase
 
   def setup
     prepare_tests
-    @author = User.find(1)
-    @assigned_user = User.find(2)
-    @changing_user = User.find(4)
+    @author = users(:users_001)
+    @assigned_user = users(:users_002)
+    @changing_user = users(:users_004)
   end
 
   def test_new_issue_with_no_autowatch