diff --git a/plugins/site_tour/controllers/site_tour_plugin_admin_controller.rb b/plugins/site_tour/controllers/site_tour_plugin_admin_controller.rb
index 7b72014..c8fe557 100644
--- a/plugins/site_tour/controllers/site_tour_plugin_admin_controller.rb
+++ b/plugins/site_tour/controllers/site_tour_plugin_admin_controller.rb
@@ -1,6 +1,6 @@
 require 'csv'
 
-class SiteTourPluginAdminController < AdminController
+class SiteTourPluginAdminController < PluginAdminController
 
   no_design_blocks
 
diff --git a/plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb b/plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
index d10207d..00acc2b 100644
--- a/plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
+++ b/plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
@@ -4,8 +4,7 @@ class SiteTourPluginAdminControllerTest < ActionController::TestCase
 
   def setup
     @environment = Environment.default
-    @profile = create_user('profile').person
-    login_as(@profile.identifier)
+    login_as(create_admin_user(@environment))
   end
 
   attr_reader :environment
--
libgit2 0.21.2