diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 8bd690880..cc21f9f03 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -25,7 +25,6 @@ import os
 import glob
 import errno
 import shlex
-import pipes  # pylint: disable=deprecated-module
 import shutil
 import tempfile
 
@@ -320,7 +319,7 @@ class HTTPInstance(service.Service):
                     if args[0] != paths.IPA_SERVER_GUARD:
                         self.backup_state('certmonger_ipa_helper', helper)
                         args = [paths.IPA_SERVER_GUARD] + args
-                        helper = ' '.join(pipes.quote(a) for a in args)
+                        helper = ' '.join(shlex.quote(a) for a in args)
                         ca_iface.Set('org.fedorahosted.certmonger.ca',
                                      'external-helper', helper)
         finally:
diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py
index 10ed12040..76bf34a3f 100755
--- a/ipatests/pytest_ipa/integration/tasks.py
+++ b/ipatests/pytest_ipa/integration/tasks.py
@@ -33,7 +33,7 @@ import copy
 import subprocess
 import tempfile
 import time
-from pipes import quote  # pylint: disable=deprecated-module
+from shlex import quote
 import configparser
 from contextlib import contextmanager
 from pkg_resources import parse_version