diff --git a/bubblewrap.c b/bubblewrap.c
index 3bca513..7809dd8 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -244,6 +244,7 @@ usage (int ecode, FILE *out)
            "    --gid GID                    Custom gid in the sandbox (requires --unshare-user or --userns)\n"
            "    --hostname NAME              Custom hostname in the sandbox (requires --unshare-uts)\n"
            "    --chdir DIR                  Change directory to DIR\n"
+           "    --clearenv                   Unset all environment variables\n"
            "    --setenv VAR VALUE           Set an environment variable\n"
            "    --unsetenv VAR               Unset an environment variable\n"
            "    --lock-file DEST             Take a lock on DEST while sandbox is running\n"
@@ -2076,6 +2077,10 @@ parse_args_recurse (int          *argcp,
           argv += 1;
           argc -= 1;
         }
+      else if (strcmp (arg, "--clearenv") == 0)
+        {
+          xclearenv ();
+        }
       else if (strcmp (arg, "--setenv") == 0)
         {
           if (argc < 3)
diff --git a/tests/test-run.sh b/tests/test-run.sh
index 1cc048b..426eeca 100755
--- a/tests/test-run.sh
+++ b/tests/test-run.sh
@@ -80,7 +80,7 @@ if [ -z "${BWRAP_MUST_WORK-}" ] && ! $RUN true; then
     skip Seems like bwrap is not working at all. Maybe setuid is not working
 fi
 
-echo "1..55"
+echo "1..56"
 
 # Test help
 ${BWRAP} --help > help.txt
@@ -531,4 +531,16 @@ $RUN \
 assert_file_has_content file-permissions '^640$'
 echo "ok - files have expected permissions"
 
+FOO= BAR=baz $RUN --setenv FOO bar sh -c 'echo "$FOO$BAR"' > stdout
+assert_file_has_content stdout barbaz
+FOO=wrong BAR=baz $RUN --setenv FOO bar sh -c 'echo "$FOO$BAR"' > stdout
+assert_file_has_content stdout barbaz
+FOO=wrong BAR=baz $RUN --unsetenv FOO sh -c 'printf "%s%s" "$FOO" "$BAR"' > stdout
+printf baz > reference
+assert_files_equal stdout reference
+FOO=wrong BAR=wrong $RUN --clearenv /usr/bin/env > stdout
+echo "PWD=$(pwd -P)" > reference
+assert_files_equal stdout reference
+echo "ok - environment manipulation"
+
 echo "ok - End of test"
diff --git a/utils.c b/utils.c
index e4ca332..530552f 100644
--- a/utils.c
+++ b/utils.c
@@ -230,6 +230,13 @@ has_prefix (const char *str,
   return strncmp (str, prefix, strlen (prefix)) == 0;
 }
 
+void
+xclearenv (void)
+{
+  if (clearenv () != 0)
+    die_with_error ("clearenv failed");
+}
+
 void
 xsetenv (const char *name, const char *value, int overwrite)
 {
diff --git a/utils.h b/utils.h
index c90c8d7..1a29dbc 100644
--- a/utils.h
+++ b/utils.h
@@ -62,6 +62,7 @@ void *xrealloc (void  *ptr,
                 size_t size);
 char *xstrdup (const char *str);
 void  strfreev (char **str_array);
+void  xclearenv (void);
 void  xsetenv (const char *name,
                const char *value,
                int         overwrite);