diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index f88528d32..2ca618a40 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class CommentTest < ActiveSupport::TestCase
-  fixtures :users, :news, :comments
+  fixtures :users, :news, :comments, :projects, :enabled_modules
 
   def setup
     @jsmith = User.find(2)
diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb
index 2e7bad436..e9049ac8e 100644
--- a/test/unit/journal_observer_test.rb
+++ b/test/unit/journal_observer_test.rb
@@ -18,7 +18,9 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class JournalObserverTest < ActiveSupport::TestCase
-  fixtures :issues, :issue_statuses, :journals, :journal_details
+  fixtures :issues, :issue_statuses, :journals, :journal_details, :projects,
+           :projects_trackers, :trackers, :enabled_modules, :enumerations,
+           :users, :roles
 
   def setup
     ActionMailer::Base.deliveries.clear
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index a2669cec1..315ea51cf 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -18,7 +18,9 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class JournalTest < ActiveSupport::TestCase
-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :member_roles
+  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details,
+           :users, :members, :member_roles, :roles, :enabled_modules,
+           :projects_trackers, :trackers
 
   def setup
     @journal = Journal.find 1
diff --git a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
index fe44bcce6..5681e945e 100644
--- a/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
+++ b/test/unit/lib/redmine/menu_manager/menu_helper_test.rb
@@ -21,7 +21,7 @@ class Redmine::MenuManager::MenuHelperTest < ActionView::TestCase
 
   include Redmine::MenuManager::MenuHelper
   include ERB::Util
-  fixtures :users, :members, :projects, :enabled_modules
+  fixtures :users, :members, :projects, :enabled_modules, :roles, :member_roles
 
   def setup
     setup_with_controller
diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index 00b7351ee..c038e3df0 100644
--- a/test/unit/message_test.rb
+++ b/test/unit/message_test.rb
@@ -18,7 +18,8 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class MessageTest < ActiveSupport::TestCase
-  fixtures :projects, :roles, :members, :member_roles, :boards, :messages, :users, :watchers
+  fixtures :projects, :roles, :members, :member_roles, :boards, :messages,
+           :users, :watchers, :enabled_modules
 
   def setup
     @board = Board.find(1)
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 8960f24af..72cb73288 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -36,6 +36,7 @@ class ProjectTest < ActiveSupport::TestCase
            :groups_users,
            :boards, :messages,
            :repositories,
+           :news, :comments,
            :documents
 
   def setup
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index e93d76c84..af5b6421e 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class RoleTest < ActiveSupport::TestCase
-  fixtures :roles, :workflows
+  fixtures :roles, :workflows, :trackers
 
   def test_sorted_scope
     assert_equal Role.all.sort, Role.sorted.all
diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb
index ec058bdd5..98bc21426 100644
--- a/test/unit/time_entry_activity_test.rb
+++ b/test/unit/time_entry_activity_test.rb
@@ -18,7 +18,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class TimeEntryActivityTest < ActiveSupport::TestCase
-  fixtures :enumerations, :time_entries
+  fixtures :enumerations, :time_entries, :custom_fields
 
   include Redmine::I18n