diff --git a/data/facter.json b/data/facter.json
index 21860d2..fff812a 100644
--- a/data/facter.json
+++ b/data/facter.json
@@ -7,7 +7,7 @@
     ],
     "sudo": [
       {
-        "code": "TF=$(mktemp -d)\necho 'exec(\"/bin/sh\")' > $TF/x.rb\nFACTERLIB=$TF sudo -E facter\n"
+        "code": "TF=$(mktemp -d)\necho 'exec(\"/bin/sh\")' > $TF/x.rb\nsudo FACTERLIB=$TF facter\n"
       }
     ]
   }
diff --git a/data/git.json b/data/git.json
index 3fdc406..e16e7d0 100644
--- a/data/git.json
+++ b/data/git.json
@@ -15,7 +15,7 @@
     ],
     "sudo": [
       {
-        "code": "PAGER='sh -c \"exec sh 0<&1\"' sudo -E git -p help"
+        "code": "sudo PAGER='sh -c \"exec sh 0<&1\"' git -p help"
       },
       {
         "description": "This invokes the default pager, which is likely to be 'less', other functions may apply.",
diff --git a/data/lwp-download.json b/data/lwp-download.json
index 5396c8e..81912e9 100644
--- a/data/lwp-download.json
+++ b/data/lwp-download.json
@@ -13,7 +13,7 @@
     ],
     "sudo": [
       {
-        "code": "sudo -E lwp-download [url] [file]\n"
+        "code": "sudo lwp-download [url] [file]\n"
       }
     ]
   }
diff --git a/data/more.json b/data/more.json
index 9e74993..9e25734 100644
--- a/data/more.json
+++ b/data/more.json
@@ -17,7 +17,7 @@
     ],
     "sudo": [
       {
-        "code": "TERM= sudo -E more /etc/profile\n!/bin/sh\n"
+        "code": "TERM= sudo more /etc/profile\n!/bin/sh\n"
       }
     ]
   }
diff --git a/data/nroff.json b/data/nroff.json
index cb38969..a35266b 100644
--- a/data/nroff.json
+++ b/data/nroff.json
@@ -7,7 +7,7 @@
     ],
     "sudo": [
       {
-        "code": "TF=$(mktemp -d)\necho '#!/bin/sh' > $TF/groff\necho '/bin/sh' >> $TF/groff\nchmod +x $TF/groff\nsudo -E GROFF_BIN_PATH=$TF nroff\n"
+        "code": "TF=$(mktemp -d)\necho '#!/bin/sh' > $TF/groff\necho '/bin/sh' >> $TF/groff\nchmod +x $TF/groff\nsudo GROFF_BIN_PATH=$TF nroff\n"
       }
     ]
   }
diff --git a/data/tftp.json b/data/tftp.json
index 73cbb74..49b055d 100644
--- a/data/tftp.json
+++ b/data/tftp.json
@@ -21,7 +21,7 @@
     "sudo": [
       {
         "description": "Send local file to a TFTP server.",
-        "code": "sudo -E tftp [host]\nput [file]\n"
+        "code": "sudo tftp [host]\nput [file]\n"
       }
     ]
   }
diff --git a/data/wget.json b/data/wget.json
index 338dc62..7ea566a 100644
--- a/data/wget.json
+++ b/data/wget.json
@@ -21,7 +21,7 @@
     "sudo": [
       {
         "description": "Fetch a remote file via HTTP GET request.",
-        "code": "sudo -E wget [url] -O [file]\n"
+        "code": "sudo wget [url] -O [file]\n"
       }
     ]
   }
diff --git a/data/zypper.json b/data/zypper.json
index 15e605e..1b1a85b 100644
--- a/data/zypper.json
+++ b/data/zypper.json
@@ -15,7 +15,7 @@
         "code": "sudo zypper x\n"
       },
       {
-        "code": "TF=$(mktemp -d)\ncp /bin/sh $TF/zypper-x\nexport PATH=$TF:$PATH\nsudo -E zypper x\n"
+        "code": "TF=$(mktemp -d)\ncp /bin/sh $TF/zypper-x\nsudo PATH=$TF:$PATH zypper x\n"
       }
     ]
   }