diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
index 9f9fe9a5dc2..14d584d632c 100644
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -91,7 +91,6 @@ class Configuration( object ):
         self.tool_data_path = resolve_path( kwargs.get( "tool_data_path", "tool-data" ), os.getcwd() )
         self.builds_file_path = resolve_path( kwargs.get( "builds_file_path", os.path.join( self.tool_data_path, 'shared', 'ucsc', 'builds.txt') ), self.root )
         self.len_file_path = resolve_path( kwargs.get( "len_file_path", os.path.join( self.tool_data_path, 'shared', 'ucsc', 'chrom') ), self.root )
-        self.test_conf = resolve_path( kwargs.get( "test_conf", "" ), self.root )
         # The value of migrated_tools_config is the file reserved for containing only those tools that have been eliminated from the distribution
         # and moved to the tool shed.
         self.integrated_tool_panel_config = resolve_path( kwargs.get( 'integrated_tool_panel_config', 'integrated_tool_panel.xml' ), self.root )
diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py
index d9f69cf8e37..43ae3d4a928 100644
--- a/lib/galaxy/webapps/tool_shed/config.py
+++ b/lib/galaxy/webapps/tool_shed/config.py
@@ -66,7 +66,6 @@ class Configuration( object ):
         self.new_file_path = resolve_path( kwargs.get( "new_file_path", "database/tmp" ), self.root )
         self.cookie_path = kwargs.get( "cookie_path", "/" )
         self.enable_quotas = string_as_bool( kwargs.get( 'enable_quotas', False ) )
-        self.test_conf = resolve_path( kwargs.get( "test_conf", "" ), self.root )
         self.id_secret = kwargs.get( "id_secret", "USING THE DEFAULT IS NOT SECURE!" )
         # Tool stuff
         self.tool_path = resolve_path( kwargs.get( "tool_path", "tools" ), self.root )
diff --git a/scripts/functional_tests.py b/scripts/functional_tests.py
index 4cd121c7391..674277a6011 100644
--- a/scripts/functional_tests.py
+++ b/scripts/functional_tests.py
@@ -87,7 +87,6 @@ def main():
     if start_server:
         # ---- Build Application --------------------------------------------------
         kwargs = dict( shed_tool_data_table_config=shed_tool_data_table_config,
-                       test_conf="test.conf",
                        tool_config_file=tool_config_file,
                        tool_data_table_config_path=tool_data_table_config_path,
                        galaxy_data_manager_data_path=galaxy_data_manager_data_path,