diff --git a/.travis.yml b/.travis.yml
index 56d33a8..aaffcd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,10 @@ jobs:
   - python: pypy
   include:
     - python: pypy
+    - python: 3.12
+    - python: 3.11
+    - python: 3.10
+    - python: 3.9
     - python: 3.8
     - python: 3.7
     - python: 3.6
diff --git a/executor/__init__.py b/executor/__init__.py
index dbe2eb7..3633f82 100644
--- a/executor/__init__.py
+++ b/executor/__init__.py
@@ -44,7 +44,6 @@
 import errno
 import logging
 import os
-import pipes
 import pprint
 import shlex
 import signal
@@ -52,6 +51,13 @@
 import sys
 import tempfile
 
+# The pipes module was deprecated in 3.11 (to be removed in 3.13).
+# shlex.quote was introduced in 3.3 and pipes adopted it immediately.
+if sys.version_info < (3, 3):
+    from pipes import quote as py_quote
+else:
+    from shlex import quote as py_quote
+
 # External dependencies.
 from humanfriendly.text import compact, concatenate, format, pluralize
 from humanfriendly.terminal import connected_to_terminal
@@ -1986,7 +1992,8 @@ def quote(*args):
     """
     Quote a string or a sequence of strings to be used as command line argument(s).
 
-    This function is a simple wrapper around :func:`pipes.quote()` which
+    This function is a simple wrapper around :func:`shlex.quote()`
+    or :func:`pipes.quote()` (if the Python version is less than 3.3) which
     adds support for quoting sequences of strings (lists and tuples). For
     example the following calls are all equivalent::
 
@@ -2006,7 +2013,7 @@ def quote(*args):
     else:
         value = args[0]
         if not isinstance(value, (list, tuple)):
-            return pipes.quote(value)
+            return py_quote(value)
     return ' '.join(map(quote, value))
 
 
diff --git a/setup.py b/setup.py
index d67418a..f2c95b7 100755
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,10 @@ def get_absolute_path(*args):
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
+          'Programming Language :: Python :: 3.11',
+          'Programming Language :: Python :: 3.12',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Topic :: Internet',