26 files changed, 118 insertions, 83 deletions

diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh
index db4c9b472..d9b7058bf 100755
--- a/test/arguments/arguments.sh
+++ b/test/arguments/arguments.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-[ -f argtest ] || make argtest
+if [ -f /etc/debian_version ]; then
+        libdir=$(dirname "$(dpkg -L firejail | grep faudit)")
+        export PATH="$PATH:$libdir"
+else
+        export PATH="$PATH:/usr/lib/firejail"
+fi
 
 echo "TESTING: 1. regular bash session"
 ./bashrun.exp
diff --git a/test/arguments/bashrun.sh b/test/arguments/bashrun.sh
index 0797c92c2..a4773fd6c 100755
--- a/test/arguments/bashrun.sh
+++ b/test/arguments/bashrun.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 1.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 1.2 - args with space and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 1.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 1.4 - args with space and \\"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit arg1\ tail arg2\ tail
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 1.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 1.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/joinrun.sh b/test/arguments/joinrun.sh
index 2743d823e..3ed166839 100755
--- a/test/arguments/joinrun.sh
+++ b/test/arguments/joinrun.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 3.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun /usr/lib/firejail/faudit arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 3.2 - args with space and \""
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 3.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 3.4 - args with space and \\"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet /usr/lib/firejail/faudit arg1\ tail arg2\ tail
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --quiet faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 3.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 3.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/arguments/outrun.sh b/test/arguments/outrun.sh
index a21243873..e2b3046d6 100755
--- a/test/arguments/outrun.sh
+++ b/test/arguments/outrun.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 echo "TESTING: 4.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit arg1 arg2
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1 arg2
 
 # simple quotes, testing spaces in file names
 echo "TESTING: 4.2 - args with space and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit "arg1 tail" "arg2 tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail"
 
 echo "TESTING: 4.3 - args with space and '"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out /usr/lib/firejail/faudit 'arg1 tail' 'arg2 tail'
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit 'arg1 tail' 'arg2 tail'
 
 # escaped space in file names
 echo "TESTING: 4.4 - args with space and \\"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out /usr/lib/firejail/faudit arg1\ tail arg2\ tail
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit arg1\ tail arg2\ tail
 
 # & char appears in URLs - URLs should be quoted
 echo "TESTING: 4.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out /usr/lib/firejail/faudit "arg1&tail" "arg2&tail"
+firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail"
 
 echo "TESTING: 4.6 - args with & and '"
-firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out /usr/lib/firejail/faudit 'arg1&tail' 'arg2&tail'
+firejail--env=FIREJAIL_TEST_ARGUMENTS=yes  --output=out faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/environment/csh.exp b/test/environment/csh.exp
index bd0cf8c86..89de94b3c 100755
--- a/test/environment/csh.exp
+++ b/test/environment/csh.exp
@@ -14,7 +14,7 @@ expect {
 }
 sleep 1
 
-send -- "find /home\r"
+send -- "find ~\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         ".cshrc"
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
index 4380f476c..1b6cdcdc5 100755
--- a/test/environment/zsh.exp
+++ b/test/environment/zsh.exp
@@ -14,7 +14,7 @@ expect {
 }
 sleep 1
 
-send -- "find /home\r"
+send -- "find ~\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         ".zshrc"
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index 10dd8da58..798c9e718 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -7,7 +7,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send -- "/usr/lib/firejail/fcopy\r"
+send -- "fcopy\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "arguments missing"
@@ -18,7 +18,7 @@ expect {
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy foo\r"
+send -- "fcopy foo\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "arguments missing"
@@ -29,14 +29,14 @@ expect {
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy f%oo1 foo2\r"
+send -- "fcopy f%oo1 foo2\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "invalid source file name"
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy foo1 f,oo2\r"
+send -- "fcopy foo1 f,oo2\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "invalid dest file name"
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index 573f454c8..e8462ae82 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy src dest\r"
+send -- "fcopy src dest\r"
 after 100
 
 send -- "find dest\r"
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index 0ae50399a..d122eff5d 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -6,6 +6,13 @@
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
+if [ -f /etc/debian_version ]; then
+        libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
+        export PATH="$PATH:$libdir"
+else
+        export PATH="$PATH:/usr/lib/firejail"
+fi
+
 mkdir dest
 
 echo "TESTING: fcopy cmdline (test/fcopy/cmdline.exp)"
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index e0d959c32..824a22bba 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy dircopy.exp dest\r"
+send -- "fcopy dircopy.exp dest\r"
 after 100
 
 send -- "find dest\r"
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index beceb3675..46ee327cb 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy src/dircopy.exp dest\r"
+send -- "fcopy src/dircopy.exp dest\r"
 after 100
 
 send -- "find dest\r"
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 4996e6d66..59d7d7e7f 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -6,6 +6,13 @@
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
+if [ -f /etc/debian_version ]; then
+        libdir=$(dirname "$(dpkg -L firejail | grep fseccomp)")
+        export PATH="$PATH:$libdir"
+else
+        export PATH="$PATH:/usr/lib/firejail"
+fi
+
 echo "TESTING: debug options (test/filters/debug.exp)"
 ./debug.exp
 
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp
index 4d876df08..433524680 100755
--- a/test/filters/fseccomp.exp
+++ b/test/filters/fseccomp.exp
@@ -8,39 +8,39 @@ spawn $env(SHELL)
 match_max 100000
 
 after 100
-send -- "/usr/lib/firejail/fseccomp debug-syscalls\r"
+send -- "fseccomp debug-syscalls\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "1      - write"
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp debug-errnos\r"
+send -- "fseccomp debug-errnos\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "1      - EPERM"
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp debug-protocols\r"
+send -- "fseccomp debug-protocols\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "unix, inet, inet6, netlink, packet,"
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp protocol build unix,inet seccomp-test-file\r"
+send -- "fseccomp protocol build unix,inet seccomp-test-file\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 4.1\n";exit}
         "WHITELIST 41 socket"
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp secondary 64 seccomp-test-file\r"
+send -- "fseccomp secondary 64 seccomp-test-file\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 5.1\n";exit}
         "BLACKLIST 165 mount"
@@ -55,9 +55,9 @@ expect {
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp default seccomp-test-file\r"
+send -- "fseccomp default seccomp-test-file\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 6.1\n";exit}
         "BLACKLIST 165 mount"
@@ -72,9 +72,9 @@ expect {
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp drop seccomp-test-file chmod,chown\r"
+send -- "fseccomp drop seccomp-test-file chmod,chown\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 7.1\n";exit}
         "BLACKLIST 165 mount" {puts "TESTING ERROR 7.2\n";exit}
@@ -91,9 +91,9 @@ expect {
 }
 
 after 100
-send -- "/usr/lib/firejail/fseccomp default drop seccomp-test-file chmod,chown\r"
+send -- "fseccomp default drop seccomp-test-file chmod,chown\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 8.1\n";exit}
         "BLACKLIST 165 mount"
@@ -115,9 +115,9 @@ expect {
         "RETURN_ALLOW"
 }
 after 100
-send -- "/usr/lib/firejail/fseccomp keep seccomp-test-file chmod,chown\r"
+send -- "fseccomp keep seccomp-test-file chmod,chown\r"
 after 100
-send -- "/usr/lib/firejail/fseccomp print seccomp-test-file\r"
+send -- "fseccomp print seccomp-test-file\r"
 expect {
         timeout {puts "TESTING ERROR 9.1\n";exit}
         "WHITELIST 90 chmod"
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-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"
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index 80760eb3a..e84ec719c 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -150,22 +150,26 @@ expect {
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.20.0/29 dev eth0  proto kernel  scope link"
+        "10.10.20.0/29 dev eth0  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.30.0/24 dev eth1  proto kernel  scope link"
+        "10.10.30.0/24 dev eth1  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.40.0/24 dev eth2  proto kernel  scope link"
+        "10.10.40.0/24 dev eth2  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.40.0/24 dev eth2 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.50.0/24 dev eth3  proto kernel  scope link"
+        "10.10.50.0/24 dev eth3  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "exit\r"
 after 100
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index 5e136926b..74a1e5d68 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -150,25 +150,29 @@ expect {
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.20.0/29 dev eth0  proto kernel  scope link"
+        "10.10.20.0/29 dev eth0  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
 }
 
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.3\n";exit}
-        "10.10.30.0/24 dev eth1  proto kernel  scope link  src 10.10.30.50"
+        "10.10.30.0/24 dev eth1  proto kernel  scope link  src 10.10.30.50" {puts "old iproute2\n";}
+        "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "new iproute2\n";}
 }
 
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.4\n";exit}
-        "10.10.40.0/24 dev eth2  proto kernel  scope link  src 10.10.40.100"
+        "10.10.40.0/24 dev eth2  proto kernel  scope link  src 10.10.40.100" {puts "old iproute2\n";}
+        "10.10.40.0/24 dev eth2  proto kernel scope link src 10.10.40.100" {puts "new iproute2\n";}
 }
 
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.5\n";exit}
-        "10.10.50.0/24 dev eth3  proto kernel  scope link"
+        "10.10.50.0/24 dev eth3  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.50.0/24 dev eth3 proto kernel scope link" {puts "new iproute2\n";}
 }
 
 send -- "exit\r"
diff --git a/test/network/interface.exp b/test/network/interface.exp
index bd8777c33..638e6d32b 100755
--- a/test/network/interface.exp
+++ b/test/network/interface.exp
@@ -27,8 +27,9 @@ expect {
         "eth0.5"
 }
 expect {
-        timeout {puts "TESTING ERROR 2n";exit}
-        "Link"
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "Link" {puts "old net-tools\n";}
+        "flags" {puts "new net-tools\n";}
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
@@ -47,7 +48,8 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
-        "Link"
+        "Link" {puts "old net-tools\n";}
+        "flags" {puts "new net-tools\n";}
 }
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index c7178616a..763eee38e 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -41,7 +41,8 @@ expect {
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.20.0/29 dev eth0  proto kernel  scope link"
+        "10.10.20.0/29 dev eth0  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "exit\r"
 after 100
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 088dfeee8..e7483c921 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -29,13 +29,15 @@ expect {
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
-        "10.10.20.0/29 dev eth0  proto kernel  scope link"
+        "10.10.20.0/29 dev eth0  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
 }
 
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10.3\n";exit}
-        "10.10.30.0/24 dev eth1  proto kernel  scope link"
+        "10.10.30.0/24 dev eth1  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.30.0/24 dev eth1 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "exit\r"
 after 100
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index c6b84781c..8ec676dd1 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -67,7 +67,8 @@ expect {
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "10.10.20.0/29 dev eth0  proto kernel  scope link"
+        "10.10.20.0/29 dev eth0  proto kernel  scope link" {puts "old iproute2\n";}
+        "10.10.20.0/29 dev eth0 proto kernel scope link" {puts "new iproute2\n";}
 }
 send -- "exit\r"
 after 100
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index febbcfcd7..b3bc9b441 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -38,13 +38,15 @@ sleep 1
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "10.10.30.0/24 dev eth1  proto kernel  scope link  src 10.10.30.50"
+        "10.10.30.0/24 dev eth1  proto kernel  scope link  src 10.10.30.50" {puts "old iproute2\n";}
+        "10.10.30.0/24 dev eth1 proto kernel scope link src 10.10.30.50" {puts "new iproute2\n";}
 }
 
 send -- "ip route show\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "10.10.40.0/24 dev eth2  proto kernel  scope link  src 10.10.40.100"
+        "10.10.40.0/24 dev eth2  proto kernel  scope link  src 10.10.40.100" {puts "old iproute2\n";}
+        "10.10.40.0/24 dev eth2 proto kernel scope link src 10.10.40.100" {puts "new iproute2\n";}
 }
 
 
diff --git a/test/utils/audit.exp b/test/utils/audit.exp
index 566493947..f0c1906a0 100755
--- a/test/utils/audit.exp
+++ b/test/utils/audit.exp
@@ -35,7 +35,7 @@ expect {
 after 100
 
 
-send -- "firejail --audit=/usr/lib/firejail/faudit\r"
+send -- "firejail --audit\r"
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
         "Firejail Audit"