diff --git a/tests/commanddata/test10.log b/tests/commanddata/test10.log
index 6b22786532..6f0fdb58b4 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 6b22786532..6f0fdb58b4 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 703e6dae91..bb3103cf6c 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 703e6dae91..bb3103cf6c 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 703e6dae91..bb3103cf6c 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 edb2fc3fac..f2b0d5e75e 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 703e6dae91..bb3103cf6c 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 a0475e6f4e..0c14074b58 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 703e6dae91..bb3103cf6c 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 f44400bc82..cfa097963b 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 6cd20959d3..f170be204e 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 f801dca886..ae5418987c 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 e30efe7b6c..fb4a754b73 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 e9e1611528..d59d8f4f06 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 1aa3e45187..ad81c2a712 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