diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index 7e0631eeff2..72d2fab9be4 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -1,9 +1,9 @@
 import logging
 import os
-import pipes
 import tempfile
 
 from six import string_types
+from six.moves import shlex_quote
 
 from galaxy import exceptions
 from galaxy.util import odict
@@ -41,7 +41,7 @@ class ToolParameterValueWrapper( object ):
         """
         rval = self.input.value_to_display_text( self.value, self.input.tool.app ) or ''
         if quote:
-            return pipes.quote( rval ) or "''"  # pipes.quote in Python < 2.7 returns an empty string instead of the expected quoted empty string
+            return shlex_quote( rval )
         return rval
 
 
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index c20c7541cb0..6bc157dd43a 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -98,7 +98,6 @@ def paste_app_factory( global_conf, **kwargs ):
     webapp.add_route( '/u/{username}/w/{slug}', controller='workflow', action='display_by_username_and_slug' )
     webapp.add_route( '/u/{username}/w/{slug}/{format}', controller='workflow', action='display_by_username_and_slug' )
     webapp.add_route( '/u/{username}/v/{slug}', controller='visualization', action='display_by_username_and_slug' )
-    webapp.add_route( '/search', controller='search', action='index' )
 
     # TODO: Refactor above routes into external method to allow testing in
     # isolation as well.
diff --git a/lib/galaxy/webapps/galaxy/controllers/search.py b/lib/galaxy/webapps/galaxy/controllers/search.py
deleted file mode 100644
index 9fde39e366c..00000000000
--- a/lib/galaxy/webapps/galaxy/controllers/search.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-Contains a basic search interface for Galaxy
-"""
-import logging
-
-from galaxy import web
-from galaxy.web.base.controller import BaseUIController
-
-log = logging.getLogger( __name__ )
-
-
-class SearchController( BaseUIController ):
-
-    @web.expose
-    def index(self, trans):
-        """
-        Per the message, this is not ready for human consumption, yet.  Power
-        users can still use the search API.
-        """
-        return trans.show_message("Sorry, the search interface isn't quite ready for use, yet.  Watch the release notes and check back later!")
diff --git a/run_tests.sh b/run_tests.sh
index e17084660b5..6cf42689987 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -249,7 +249,7 @@ ensure_grunt_for_qunit() {
 }
 
 
-DOCKER_DEFAULT_IMAGE='galaxy/testing-base:17.01.0'
+DOCKER_DEFAULT_IMAGE='galaxy/testing-base:17.05.0'
 
 test_script="./scripts/functional_tests.py"
 report_file="run_functional_tests.html"