diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 525c71b45e..5b714a6289 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -1,3 +1,20 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 require File.dirname(__FILE__) + '/../test_helper'
 require 'my_controller'
 
@@ -8,11 +25,65 @@ class MyControllerTest < Test::Unit::TestCase
   def setup
     @controller = MyController.new
     @request    = ActionController::TestRequest.new
+    @request.session[:user_id] = 2
     @response   = ActionController::TestResponse.new
   end
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'page'
+  end
+  
+  def test_page
+    get :page
+    assert_response :success
+    assert_template 'page'
+  end
+  
+  def test_get_account
+    get :account
+    assert_response :success
+    assert_template 'account'
+    assert_equal User.find(2), assigns(:user)
+  end
+
+  def test_update_account
+    post :account, :user => {:firstname => "Joe", :login => "root", :admin => 1}
+    assert_response :success
+    assert_template 'account'
+    user = User.find(2)
+    assert_equal user, assigns(:user)
+    assert_equal "Joe", user.firstname
+    assert_equal "jsmith", user.login
+    assert !user.admin?
+  end
+  
+  def test_change_password
+    get :account
+    assert_response :success
+    assert_template 'account'
+    
+    # non matching password confirmation
+    post :change_password, :password => 'jsmith', 
+                           :new_password => 'hello',
+                           :new_password_confirmation => 'hello2'
+    assert_response :success
+    assert_template 'account'
+    assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
+    
+    # wrong password
+    post :change_password, :password => 'wrongpassword', 
+                           :new_password => 'hello',
+                           :new_password_confirmation => 'hello'
+    assert_redirected_to 'my/account'
+    assert_equal 'Wrong password', flash[:notice]
+    
+    # good password
+    post :change_password, :password => 'jsmith',
+                           :new_password => 'hello',
+                           :new_password_confirmation => 'hello'
+    assert_redirected_to 'my/account'
+    assert User.try_to_login('jsmith', 'hello')
   end
 end
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index ae027082c0..6799b9288c 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -31,48 +31,6 @@ class AccountTest < ActionController::IntegrationTest
     assert_template "my/account"    
   end
   
-  def test_change_password
-    log_user('jsmith', 'jsmith')
-    get "my/account"
-    assert_response :success
-    assert_template "my/account" 
-    
-    post "my/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
-    assert_response :success
-    assert_template "my/account" 
-    assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
-
-    post "my/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello"
-    assert_redirected_to "my/account"
-    assert_equal 'Wrong password', flash[:notice]
-        
-    post "my/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
-    assert_redirected_to "my/account"
-    log_user('jsmith', 'hello')
-  end
-  
-  def test_my_account
-    log_user('jsmith', 'jsmith')
-    get "my/account"
-    assert_response :success
-    assert_template "my/account" 
-    
-    post "my/account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
-    assert_response :success
-    assert_template "my/account" 
-    user = User.find(2)
-    assert_equal "Joe", user.firstname
-    assert_equal "jsmith", user.login
-    assert_equal false, user.admin?    
-  end
-  
-  def test_my_page
-    log_user('jsmith', 'jsmith')
-    get "my/page"
-    assert_response :success
-    assert_template "my/page"
-  end
-  
   def test_lost_password
     Token.delete_all