diff --git a/tests/commanddata/test10.log b/tests/commanddata/test10.log
index 6b22786532e2d0df2e0e6667cd9eaefdc3dabdad..6f0fdb58b461af7acc27b5ba3e77c5f0c3a5e193 100644
--- a/tests/commanddata/test10.log
+++ b/tests/commanddata/test10.log
@@ -4,8 +4,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test11.log b/tests/commanddata/test11.log
index 6b22786532e2d0df2e0e6667cd9eaefdc3dabdad..6f0fdb58b461af7acc27b5ba3e77c5f0c3a5e193 100644
--- a/tests/commanddata/test11.log
+++ b/tests/commanddata/test11.log
@@ -4,8 +4,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test12.log b/tests/commanddata/test12.log
index 703e6dae91f2da575a3157577e08370afc001566..bb3103cf6c6264cf92f2b3736a74045e9ee1d97c 100644
--- a/tests/commanddata/test12.log
+++ b/tests/commanddata/test12.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test13.log b/tests/commanddata/test13.log
index 703e6dae91f2da575a3157577e08370afc001566..bb3103cf6c6264cf92f2b3736a74045e9ee1d97c 100644
--- a/tests/commanddata/test13.log
+++ b/tests/commanddata/test13.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test14.log b/tests/commanddata/test14.log
index 703e6dae91f2da575a3157577e08370afc001566..bb3103cf6c6264cf92f2b3736a74045e9ee1d97c 100644
--- a/tests/commanddata/test14.log
+++ b/tests/commanddata/test14.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test15.log b/tests/commanddata/test15.log
index edb2fc3fac48098ce985f56aac27d976f205f11a..f2b0d5e75e45acf7a3dffa150ac83e8410160325 100644
--- a/tests/commanddata/test15.log
+++ b/tests/commanddata/test15.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test2.log b/tests/commanddata/test2.log
index 703e6dae91f2da575a3157577e08370afc001566..bb3103cf6c6264cf92f2b3736a74045e9ee1d97c 100644
--- a/tests/commanddata/test2.log
+++ b/tests/commanddata/test2.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test20.log b/tests/commanddata/test20.log
index a0475e6f4ecad9a3be695172c3b598888e09ffe5..0c14074b588216a8f5266886b32cd349fb1fdd6d 100644
--- a/tests/commanddata/test20.log
+++ b/tests/commanddata/test20.log
@@ -3,8 +3,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log
index 703e6dae91f2da575a3157577e08370afc001566..bb3103cf6c6264cf92f2b3736a74045e9ee1d97c 100644
--- a/tests/commanddata/test21.log
+++ b/tests/commanddata/test21.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log
index f44400bc82b0995c84b2e6b1eb9dfd4b799ad6eb..cfa097963b4662396984dae3de032b9a4b52d223 100644
--- a/tests/commanddata/test3.log
+++ b/tests/commanddata/test3.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test4.log b/tests/commanddata/test4.log
index 6cd20959d340cf5b62926736445a3dd685b49d75..f170be204eaa8553afb66779f686629f680950fe 100644
--- a/tests/commanddata/test4.log
+++ b/tests/commanddata/test4.log
@@ -2,8 +2,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test5.log b/tests/commanddata/test5.log
index f801dca886375f3a67d4890504baa73a7ba30741..ae5418987c62e2e38f05f95a91cc2cac4ed68464 100644
--- a/tests/commanddata/test5.log
+++ b/tests/commanddata/test5.log
@@ -1,7 +1,8 @@
 ENV:HOME=/home/test
 ENV:LC_ALL=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test7.log b/tests/commanddata/test7.log
index e30efe7b6cfa2cc417c87a47e031fa4177ab9f34..fb4a754b7360afac0fe7c117c47df7aa4f183317 100644
--- a/tests/commanddata/test7.log
+++ b/tests/commanddata/test7.log
@@ -1,8 +1,9 @@
 ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:LC_ALL=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commanddata/test9.log b/tests/commanddata/test9.log
index e9e161152899df8068f9c9706dcbc61126db1641..d59d8f4f0659eaa6b1df62659a41cea9318689a9 100644
--- a/tests/commanddata/test9.log
+++ b/tests/commanddata/test9.log
@@ -10,8 +10,9 @@ ENV:DISPLAY=:0.0
 ENV:HOME=/home/test
 ENV:HOSTNAME=test
 ENV:LANG=C
-ENV:LOGNAME=testTMPDIR=/tmp
+ENV:LOGNAME=test
 ENV:PATH=/usr/bin:/bin
+ENV:TMPDIR=/tmp
 ENV:USER=test
 FD:0
 FD:1
diff --git a/tests/commandtest.c b/tests/commandtest.c
index 1aa3e45187f3f7f7152d542f2a7d3fe450de7a65..ad81c2a71219f50bb44734a8d9f02e6900d3ca2d 100644
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -843,7 +843,7 @@ static const char *const newenv[] = {
     "LANG=C",
     "HOME=/home/test",
     "USER=test",
-    "LOGNAME=test"
+    "LOGNAME=test",
     "TMPDIR=/tmp",
     "DISPLAY=:0.0",
     NULL