diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb
index be597c9d..65cb9994 100644
--- a/test/functional/todos_controller_test.rb
+++ b/test/functional/todos_controller_test.rb
@@ -358,7 +358,7 @@ class TodosControllerTest < ActionController::TestCase
         "show_from(1i)"=>"", "show_from(2i)"=>"", "show_from(3i)"=>"",
         "project_id"=>"1",
         "notes"=>"test notes", "description"=>"test_mobile_create_action", "state"=>"0"}}
-    assert_redirected_to '/m'
+    assert_redirected_to '/mobile'
   end
 
   def test_mobile_create_action_renders_new_template_when_save_fails
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index ebc2fb6e..0261efd6 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -52,7 +52,7 @@ class UsersControllerTest < ActionController::TestCase
   def test_destroy_user
     login_as :admin_user
     @no_users_before = User.find(:all).size
-    xhr :post, :destroy, :id => users(:ldap_user).to_param
+    xhr :post, :destroy, :id => users(:ldap_user).id.to_param
     assert_rjs :page, "user-3", :remove
     assert_equal @no_users_before-1, User.find(:all).size
   end
diff --git a/test/integration/users_xml_api_test.rb b/test/integration/users_xml_api_test.rb
index 43a8521e..f80f6b25 100644
--- a/test/integration/users_xml_api_test.rb
+++ b/test/integration/users_xml_api_test.rb
@@ -84,7 +84,7 @@ class UsersXmlApiTest < ActionController::IntegrationTest
   end
 
   def test_get_user_as_xml
-    get "/users/#{users(:other_user).login}.xml", {}, basic_auth_headers()
+    get "/users/#{users(:other_user).id}.xml", {}, basic_auth_headers()
     assert_response :success
     assert_tag :tag => "user"
     assert_no_tag :tag => "password"
@@ -104,4 +104,4 @@ class UsersXmlApiTest < ActionController::IntegrationTest
     assert_response_and_body 404, "Expected post format is valid xml like so: <request><login>username</login><password>abc123</password></request>."
   end
   
-end
\ No newline at end of file
+end
diff --git a/test/unit/message_gateway_test.rb b/test/unit/message_gateway_test.rb
index b93376a3..ffb8c5c3 100644
--- a/test/unit/message_gateway_test.rb
+++ b/test/unit/message_gateway_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class MessageGatewayTest < ActiveSupport::TestCase
-  fixtures :users, :contexts
+  fixtures :users, :contexts, :todos
 
   def setup
     @user = users(:sms_user)