diff --git a/Gemfile.lock b/Gemfile.lock
index 6b6cb547..a208d4d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,8 +73,8 @@ GEM
       will_paginate (~> 3.0.pre)
     multi_json (0.0.5)
     multipart-post (1.1.0)
-    nokogiri (1.4.4)
-    nokogiri (1.4.4-java)
+    nokogiri (1.4.3.1)
+    nokogiri (1.4.3.1-java)
       weakling (>= 0.0.3)
     oa-core (0.2.0)
       rack (~> 1.1)
diff --git a/test/rails_app/config/routes.rb b/test/rails_app/config/routes.rb
index c56ceb0e..32c7ae6a 100644
--- a/test/rails_app/config/routes.rb
+++ b/test/rails_app/config/routes.rb
@@ -29,10 +29,10 @@ Rails.application.routes.draw do
   end
   
   # Routes for constraints testing
-  devise_for :admin, :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
+  devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
   
   constraints(:host => /192\.168\.1\.\d\d\d/) do
-    devise_for :admin, :path => "homebase"
+    devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
   end
   
   # Other routes for routing_test.rb