diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
new file mode 100644
index 0000000..81070bb
--- /dev/null
+++ b/test/functional/admin_controller_test.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'environment_admin_controller'
+
+# Re-raise errors caught by the controller.
+class EnvironmentAdminController; def rescue_action(e) raise e end; end
+
+class EnvironmentAdminControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = EnvironmentAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
diff --git a/test/functional/environment_admin_controller_test.rb b/test/functional/environment_admin_controller_test.rb
deleted file mode 100644
index 81070bb..0000000
--- a/test/functional/environment_admin_controller_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'environment_admin_controller'
-
-# Re-raise errors caught by the controller.
-class EnvironmentAdminController; def rescue_action(e) raise e end; end
-
-class EnvironmentAdminControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = EnvironmentAdminController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/my_profile_controller_test.rb b/test/functional/my_profile_controller_test.rb
index 36bc10f..1f12dbd 100644
--- a/test/functional/my_profile_controller_test.rb
+++ b/test/functional/my_profile_controller_test.rb
@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'profile_admin_controller'
+require 'my_profile_controller'
 
 # Re-raise errors caught by the controller.
-class ProfileAdminController; def rescue_action(e) raise e end; end
+class MyProfileController; def rescue_action(e) raise e end; end
 
-class OnlyForPersonTestController < ProfileAdminController
+class OnlyForPersonTestController < MyProfileController
   requires_profile_class Person
   def index
     render :text => '<div>something</div>'
   end
 end
 
-class ProfileAdminControllerTest < Test::Unit::TestCase
+class MyProfileControllerTest < Test::Unit::TestCase
 
   all_fixtures
   def setup
-    @controller = ProfileAdminController.new
+    @controller = MyProfileController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
diff --git a/test/functional/system_admin_controller_test.rb b/test/functional/system_admin_controller_test.rb
deleted file mode 100644
index 2d0da2f..0000000
--- a/test/functional/system_admin_controller_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'system_admin_controller'
-
-# Re-raise errors caught by the controller.
-class SystemAdminController; def rescue_action(e) raise e end; end
-
-class SystemAdminControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = SystemAdminController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff --git a/test/functional/system_controller.rb b/test/functional/system_controller.rb
new file mode 100644
index 0000000..2d0da2f
--- /dev/null
+++ b/test/functional/system_controller.rb
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'system_admin_controller'
+
+# Re-raise errors caught by the controller.
+class SystemAdminController; def rescue_action(e) raise e end; end
+
+class SystemAdminControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = SystemAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
--
libgit2 0.21.2