diff --git a/test/app-emu/java/HelloWorld/run.sh b/test/app-emu/java/HelloWorld/run.sh
index 7f94d3a25..0ed6afd14 100644
--- a/test/app-emu/java/HelloWorld/run.sh
+++ b/test/app-emu/java/HelloWorld/run.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 source ../../../functions.sh || exit 1
-
-criu="../../../../criu"
+source ../../../env.sh || exit 1
 
 cleanup_class() {
 	rm -f ./*.class
diff --git a/test/app-emu/job/job.exp b/test/app-emu/job/job.exp
index 1b9b7fba9..1409103e3 100755
--- a/test/app-emu/job/job.exp
+++ b/test/app-emu/job/job.exp
@@ -1,5 +1,7 @@
 #!/usr/bin/expect
 
+source ../../env.sh || exit 1
+
 exec rm -rf ./dump
 exec mkdir ./dump
 
@@ -21,7 +23,7 @@ switch $current {
 			puts "FAIL: Timed out on ready"
 			exit -1
 		}
-		system ../../../criu dump -v4 -D ./dump -o dump.log -j -t $pid
+		system $criu dump -v4 -D ./dump -o dump.log -j -t $pid
 		system echo "$pid" > ./dump/pid.pid
 		exit 0
 	}
@@ -37,7 +39,7 @@ switch $current {
 			exit -1
 		}
 
-		spawn ../../../criu restore -v4 -D ./dump -o restore.log -j
+		spawn $criu restore -v4 -D ./dump -o restore.log -j
 		#
 		# spawn doesn't wait for restore to complete, so
 		# add some sleep here. Still better would be to
diff --git a/test/app-emu/lxc/run.sh b/test/app-emu/lxc/run.sh
index 3b86f0026..3664f5f8d 100755
--- a/test/app-emu/lxc/run.sh
+++ b/test/app-emu/lxc/run.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
+source ../../env.sh || exit 1
+
 [ -z "$CR_IP_TOOL" ] && CR_IP_TOOL=ip
 
 cd `dirname $0`
 
-criu="../../../criu"
-
 name=$1
 [ -z "$name" ] && { cat <<EOF
 Usage: $0 NAME [PID]"
diff --git a/test/app-emu/make/run.sh b/test/app-emu/make/run.sh
index 582d4d70d..7cb44c770 100644
--- a/test/app-emu/make/run.sh
+++ b/test/app-emu/make/run.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 source ../../functions.sh || exit 1
-
-criu="../../../criu"
+source ../../env.sh || exit 1
 
 cleanup_wd() {
 	rm -f "ref-*"
diff --git a/test/app-emu/screen/run.sh b/test/app-emu/screen/run.sh
index 67c991342..322749187 100644
--- a/test/app-emu/screen/run.sh
+++ b/test/app-emu/screen/run.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 source ../../functions.sh || exit 1
-
-criu="../../../criu"
+source ../../env.sh || exit 1
 
 set -x
 
diff --git a/test/app-emu/tarbz/run.sh b/test/app-emu/tarbz/run.sh
index 0a48900e9..677c6de46 100644
--- a/test/app-emu/tarbz/run.sh
+++ b/test/app-emu/tarbz/run.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 source ../../functions.sh || exit 1
+source ../../env.sh || exit 1
 
-criu="../../../criu"
 DEPTH=3
 SPAN=5
 archref="arch-ref.tar.bz2"
diff --git a/test/app-emu/vnc/run.sh b/test/app-emu/vnc/run.sh
index 7445d6330..b3a9822f9 100755
--- a/test/app-emu/vnc/run.sh
+++ b/test/app-emu/vnc/run.sh
@@ -1,8 +1,7 @@
 set -m
 
 source ../../functions.sh || exit 1
-
-criu="../../../criu"
+source ../../env.sh || exit 1
 
 mkdir data
 
diff --git a/test/env.sh b/test/env.sh
new file mode 100755
index 000000000..ab015e09b
--- /dev/null
+++ b/test/env.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../criu)
+criu=$CRIU
diff --git a/test/mem-snap/run-predump-2.sh b/test/mem-snap/run-predump-2.sh
index bb336e886..3fc2f7443 100755
--- a/test/mem-snap/run-predump-2.sh
+++ b/test/mem-snap/run-predump-2.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
+source ../env.sh || exit 1
+
 function fail {
 	echo "$@"
 	exit 1
 }
 set -x
 
-CRIU="../../criu"
 IMGDIR="dump/"
 
 rm -rf "$IMGDIR"
diff --git a/test/mem-snap/run-predump.sh b/test/mem-snap/run-predump.sh
index edfd26fd5..741d8ebb6 100755
--- a/test/mem-snap/run-predump.sh
+++ b/test/mem-snap/run-predump.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ../env.sh || exit 1
+
 USEPS=0
 
 if [ "$1" = "-s" ]; then
@@ -18,7 +20,6 @@ function fail {
 }
 set -x
 
-CRIU="../../criu"
 IMGDIR="dump/"
 
 rm -rf "$IMGDIR"
diff --git a/test/mem-snap/run-snap.sh b/test/mem-snap/run-snap.sh
index 08f76697d..d2a620726 100755
--- a/test/mem-snap/run-snap.sh
+++ b/test/mem-snap/run-snap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ../env.sh || exit 1
+
 USEPS=0
 
 if [ "$1" = "-s" ]; then
@@ -18,7 +20,6 @@ function fail {
 }
 set -x
 
-CRIU="../../criu"
 IMGDIR="dump/"
 
 rm -rf "$IMGDIR"
diff --git a/test/tcp/run.sh b/test/tcp/run.sh
index 43a0674a1..702879d52 100755
--- a/test/tcp/run.sh
+++ b/test/tcp/run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source ../env.sh || exit 1
+
 set -x
 
 PORT=12345
@@ -7,7 +9,6 @@ CLN_PIPE="./clnt_pipe"
 SRV_LOG="./srv.log"
 CLN_LOG="./cln.log"
 DDIR="dump"
-CRIU="../../criu"
 
 TEXT=$(hexdump -C /dev/urandom | head -n 1)
 
diff --git a/test/zdtm.sh b/test/zdtm.sh
index ff3086924..135a00733 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -137,7 +137,8 @@ fanotify00
 sk-netlink
 "
 
-CRIU=$(readlink -f `dirname $0`/../criu)
+source $(readlink -f `dirname $0`/env.sh) || exit 1
+
 CRIU_CPT=$CRIU
 TMP_TREE=""
 SCRIPTDIR=`dirname $CRIU`/test