6 files changed, 24 insertions, 24 deletions

diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp
index 28a5ae459..1faa913e0 100755
--- a/test/fs/mkdir_mkfile.exp
+++ b/test/fs/mkdir_mkfile.exp
@@ -16,11 +16,7 @@ expect {
 }
 sleep 1
 
-send -- "find ~\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "_firejail_test_file"
-}
+send -- "find ~ | LC_ALL=C sort\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "_firejail_test_dir"
@@ -41,6 +37,10 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "_firejail_test_dir/dir1/dir2/dir3/file1"
 }
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "_firejail_test_file"
+}
 after 100
 send -- "exit\r"
 after 100
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp
index 77baeeb5f..9c97ff4ea 100755
--- a/test/fs/private-home-dir.exp
+++ b/test/fs/private-home-dir.exp
@@ -41,7 +41,11 @@ expect {
 }
 after 100
 
-send -- "ls -al ~\r"
+send -- "find ~ | LC_ALL=C sort\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        ".Xauthority"
+}
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         ".asoundrc"
@@ -50,10 +54,6 @@ expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         ".bashrc"
 }
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        ".Xauthority"
-}
 after 100
 
 send -- "exit\r"
diff --git a/test/fs/private.exp b/test/fs/private.exp
index c7059079d..e522ca5a1 100755
--- a/test/fs/private.exp
+++ b/test/fs/private.exp
@@ -37,18 +37,18 @@ expect {
 }
 after 100
 
-send -- "ls -al ~\r"
+send -- "find ~ | LC_ALL=C sort\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        ".asoundrc"
+        ".Xauthority"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        ".bashrc"
+        ".asoundrc"
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        ".Xauthority"
+        ".bashrc"
 }
 after 100
 
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp
index dd2336ce1..ac6adc165 100755
--- a/test/fs/whitelist-double.exp
+++ b/test/fs/whitelist-double.exp
@@ -32,10 +32,10 @@ expect {
         "123"
 }
 
-send -- "rm /tmp/firejal-deleteme\r"
+send -- "rm -v /tmp/firejal-deleteme\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "0"
+        "removed"
 }
 after 100
 
diff --git a/test/fs/whitelist-downloads.exp b/test/fs/whitelist-downloads.exp
index f3eb0d6a2..a64197953 100755
--- a/test/fs/whitelist-downloads.exp
+++ b/test/fs/whitelist-downloads.exp
@@ -17,7 +17,7 @@ expect {
 }
 after 100
 
-send -- "firejail --force --profile=/etc/firejail/firefox.profile\r"
+send -- "firejail --force --ignore=shell --profile=/etc/firejail/firefox.profile\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "cannot whitelist Downloads directory"
@@ -34,7 +34,7 @@ after 100
 send -- "cp /tmp/user-dirs.dirs ~/.config/.\r"
 after 100
 
-send -- "firejail --force --profile=/etc/firejail/firefox.profile\r"
+send -- "firejail --force --ignore=shell --profile=/etc/firejail/firefox.profile\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "cannot whitelist Downloads directory"
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp
index e1c3ffb4a..9e4406263 100755
--- a/test/fs/whitelist-empty.exp
+++ b/test/fs/whitelist-empty.exp
@@ -14,36 +14,36 @@ expect {
 }
 sleep 1
 
-send -- "ls -l ~/ | wc -l\r"
+send -- "ls -l ~\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "0"
 }
 
-send -- "ls -l /tmp | wc -l\r"
+send -- "ls -l /tmp\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "0"
 }
 
-send -- "ls -l /media | wc -l\r"
+send -- "ls -l /media\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "0"
 }
 
-send -- "ls -l /var | wc -l\r"
+send -- "ls -l /var\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "0"
 }
 
-send -- "ls -l /dev | wc -l\r"
+send -- "ls -l /dev\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "0"
 }
-send -- "ls -l /opt | wc -l\r"
+send -- "ls -l /opt\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "0"