diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index a6e3799916..4d96a3f3b7 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -22,7 +22,7 @@ require 'account_controller'
 class AccountController; def rescue_action(e) raise e end; end
 
 class AccountControllerTest < Test::Unit::TestCase
-  fixtures :users
+  fixtures :users, :roles
   
   def setup
     @controller = AccountController.new
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index f5c3c0f57a..c60a4a0e00 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -23,7 +23,8 @@ class AttachmentsController; def rescue_action(e) raise e end; end
 
 
 class AttachmentsControllerTest < Test::Unit::TestCase
-  fixtures :users, :projects, :roles, :members, :enabled_modules, :issues, :attachments
+  fixtures :users, :projects, :roles, :members, :enabled_modules, :issues, :attachments,
+           :versions, :wiki_pages, :wikis
   
   def setup
     @controller = AttachmentsController.new