diff --git a/test/app-emu.sh b/test/others/app-emu.sh
similarity index 100%
rename from test/app-emu.sh
rename to test/others/app-emu.sh
diff --git a/test/app-emu/java/HelloWorld/HelloWorld.java b/test/others/app-emu/java/HelloWorld/HelloWorld.java
similarity index 100%
rename from test/app-emu/java/HelloWorld/HelloWorld.java
rename to test/others/app-emu/java/HelloWorld/HelloWorld.java
diff --git a/test/app-emu/java/HelloWorld/run.sh b/test/others/app-emu/java/HelloWorld/run.sh
similarity index 100%
rename from test/app-emu/java/HelloWorld/run.sh
rename to test/others/app-emu/java/HelloWorld/run.sh
diff --git a/test/app-emu/job/Makefile b/test/others/app-emu/job/Makefile
similarity index 100%
rename from test/app-emu/job/Makefile
rename to test/others/app-emu/job/Makefile
diff --git a/test/app-emu/job/job.c b/test/others/app-emu/job/job.c
similarity index 100%
rename from test/app-emu/job/job.c
rename to test/others/app-emu/job/job.c
diff --git a/test/app-emu/job/job.exp b/test/others/app-emu/job/job.exp
similarity index 100%
rename from test/app-emu/job/job.exp
rename to test/others/app-emu/job/job.exp
diff --git a/test/app-emu/job/run.sh b/test/others/app-emu/job/run.sh
similarity index 100%
rename from test/app-emu/job/run.sh
rename to test/others/app-emu/job/run.sh
diff --git a/test/app-emu/lxc/network-script.sh b/test/others/app-emu/lxc/network-script.sh
similarity index 100%
rename from test/app-emu/lxc/network-script.sh
rename to test/others/app-emu/lxc/network-script.sh
diff --git a/test/app-emu/lxc/run.sh b/test/others/app-emu/lxc/run.sh
similarity index 100%
rename from test/app-emu/lxc/run.sh
rename to test/others/app-emu/lxc/run.sh
diff --git a/test/app-emu/make/Makefile b/test/others/app-emu/make/Makefile
similarity index 100%
rename from test/app-emu/make/Makefile
rename to test/others/app-emu/make/Makefile
diff --git a/test/app-emu/make/run.sh b/test/others/app-emu/make/run.sh
similarity index 100%
rename from test/app-emu/make/run.sh
rename to test/others/app-emu/make/run.sh
diff --git a/test/app-emu/make/tmpl.c b/test/others/app-emu/make/tmpl.c
similarity index 100%
rename from test/app-emu/make/tmpl.c
rename to test/others/app-emu/make/tmpl.c
diff --git a/test/app-emu/screen/run.sh b/test/others/app-emu/screen/run.sh
similarity index 100%
rename from test/app-emu/screen/run.sh
rename to test/others/app-emu/screen/run.sh
diff --git a/test/app-emu/tarbz/run.sh b/test/others/app-emu/tarbz/run.sh
similarity index 100%
rename from test/app-emu/tarbz/run.sh
rename to test/others/app-emu/tarbz/run.sh
diff --git a/test/app-emu/vnc/run.sh b/test/others/app-emu/vnc/run.sh
similarity index 100%
rename from test/app-emu/vnc/run.sh
rename to test/others/app-emu/vnc/run.sh
diff --git a/test/app-emu/vnc/vnc-server.sh b/test/others/app-emu/vnc/vnc-server.sh
similarity index 100%
rename from test/app-emu/vnc/vnc-server.sh
rename to test/others/app-emu/vnc/vnc-server.sh
diff --git a/test/env.sh b/test/others/env.sh
similarity index 100%
rename from test/env.sh
rename to test/others/env.sh
diff --git a/test/functions.sh b/test/others/functions.sh
similarity index 100%
rename from test/functions.sh
rename to test/others/functions.sh
diff --git a/test/others/libcriu/run.sh b/test/others/libcriu/run.sh
index f7b3b68ff..a99b91e52 100755
--- a/test/others/libcriu/run.sh
+++ b/test/others/libcriu/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -x
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 echo "== Clean"
 make clean
diff --git a/test/others/mem-snap/run-predump-2.sh b/test/others/mem-snap/run-predump-2.sh
index 809612e67..aa115fc99 100755
--- a/test/others/mem-snap/run-predump-2.sh
+++ b/test/others/mem-snap/run-predump-2.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 function fail {
 	echo "$@"
diff --git a/test/others/mem-snap/run-predump.sh b/test/others/mem-snap/run-predump.sh
index 073784a87..aba3e710f 100755
--- a/test/others/mem-snap/run-predump.sh
+++ b/test/others/mem-snap/run-predump.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/mem-snap/run-snap-auto-dedup.sh b/test/others/mem-snap/run-snap-auto-dedup.sh
index c0d87792e..026208bcc 100755
--- a/test/others/mem-snap/run-snap-auto-dedup.sh
+++ b/test/others/mem-snap/run-snap-auto-dedup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/mem-snap/run-snap-dedup-on-restore.sh b/test/others/mem-snap/run-snap-dedup-on-restore.sh
index 5821d8a68..1e0078018 100755
--- a/test/others/mem-snap/run-snap-dedup-on-restore.sh
+++ b/test/others/mem-snap/run-snap-dedup-on-restore.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/mem-snap/run-snap-dedup.sh b/test/others/mem-snap/run-snap-dedup.sh
index f59342e6e..5a1b9e4cf 100755
--- a/test/others/mem-snap/run-snap-dedup.sh
+++ b/test/others/mem-snap/run-snap-dedup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/mem-snap/run-snap-maps04.sh b/test/others/mem-snap/run-snap-maps04.sh
index 97c493958..71a59b229 100755
--- a/test/others/mem-snap/run-snap-maps04.sh
+++ b/test/others/mem-snap/run-snap-maps04.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/mem-snap/run-snap.sh b/test/others/mem-snap/run-snap.sh
index 6aca4d971..ddf02b579 100755
--- a/test/others/mem-snap/run-snap.sh
+++ b/test/others/mem-snap/run-snap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 USEPS=0
 
diff --git a/test/others/tcp/run.sh b/test/others/tcp/run.sh
index c7f86a085..702879d52 100755
--- a/test/others/tcp/run.sh
+++ b/test/others/tcp/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ../../env.sh || exit 1
+source ../env.sh || exit 1
 
 set -x