diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb
index 3b7d617b..98efc207 100644
--- a/test/controllers/preferences_controller_test.rb
+++ b/test/controllers/preferences_controller_test.rb
@@ -57,7 +57,11 @@ class PreferencesControllerTest < ActionController::TestCase
       :prefs => { :date_format => "%m-%d-%Y", :week_starts => "0", :show_number_completed => "10", :show_completed_projects_in_sidebar => "false", :show_hidden_contexts_in_sidebar => "false", :staleness_starts => "14", :due_style => "1" }}
 
     updated_admin_user = users(:admin_user).reload
-    assert_equal old_password_hash, updated_admin_user.password
+    if old_password_hash.nil?
+        assert_nil updated_admin_user.password
+    else
+        assert_equal old_password_hash, updated_admin_user.password
+    end
   end
 
 end
diff --git a/test/models/project_from_todo_test.rb b/test/models/project_from_todo_test.rb
index ee06d783..ae7a7409 100644
--- a/test/models/project_from_todo_test.rb
+++ b/test/models/project_from_todo_test.rb
@@ -9,7 +9,7 @@ class ProjectFromTodoTest < ActiveSupport::TestCase
     project = ProjectFromTodo.new(todo).create
     assert_equal project.name, todo.description
     assert_equal project.description, todo.notes
-    if project.default.context.nil?
+    if project.default_context.nil?
         assert_nil todo.context
     else
         assert_equal project.default_context, todo.context