diff --git a/tests/benchmarks/run-benchmark.sh b/tests/benchmarks/run-benchmark.sh
index f0e3e2857..707f24ff0 100755
--- a/tests/benchmarks/run-benchmark.sh
+++ b/tests/benchmarks/run-benchmark.sh
@@ -94,7 +94,7 @@ fi
 # Set paths
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 # Declare location of config files
 CONFIG=$(mktemp /tmp/nodetype-benchmark-config-XXXX.conf)
diff --git a/tests/integration/node-infiniband.sh b/tests/integration/node-infiniband.sh
index 411fbd699..5c0fed3ff 100755
--- a/tests/integration/node-infiniband.sh
+++ b/tests/integration/node-infiniband.sh
@@ -43,7 +43,7 @@ fi
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp /tmp/ib-configuration-XXXX.conf)
 CONFIG_FILE_TARGET=$(mktemp /tmp/ib-configuration-target-XXXX.conf)
diff --git a/tests/integration/node-loopback-socket.sh b/tests/integration/node-loopback-socket.sh
index cb933a884..ed4454d2d 100755
--- a/tests/integration/node-loopback-socket.sh
+++ b/tests/integration/node-loopback-socket.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/node-mux_demux.sh b/tests/integration/node-mux_demux.sh
index 2ada0b9ab..cdf453ce6 100755
--- a/tests/integration/node-mux_demux.sh
+++ b/tests/integration/node-mux_demux.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 OUTPUT_FILE=$(mktemp)
diff --git a/tests/integration/node-test_rtt.sh b/tests/integration/node-test_rtt.sh
index 61d731e1f..6dd133fa5 100755
--- a/tests/integration/node-test_rtt.sh
+++ b/tests/integration/node-test_rtt.sh
@@ -28,7 +28,7 @@ exit 99
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 
diff --git a/tests/integration/pipe-file-advio.sh b/tests/integration/pipe-file-advio.sh
index 720529b64..52b09a7ee 100755
--- a/tests/integration/pipe-file-advio.sh
+++ b/tests/integration/pipe-file-advio.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-amqp.sh b/tests/integration/pipe-loopback-amqp.sh
index 5957e7e51..b2137286a 100755
--- a/tests/integration/pipe-loopback-amqp.sh
+++ b/tests/integration/pipe-loopback-amqp.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-iec61850-9-2.sh b/tests/integration/pipe-loopback-iec61850-9-2.sh
index a9b625803..1d7dd2b48 100755
--- a/tests/integration/pipe-loopback-iec61850-9-2.sh
+++ b/tests/integration/pipe-loopback-iec61850-9-2.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-mqtt.sh b/tests/integration/pipe-loopback-mqtt.sh
index 2059e51bf..0be1dfd78 100755
--- a/tests/integration/pipe-loopback-mqtt.sh
+++ b/tests/integration/pipe-loopback-mqtt.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-nanomsg.sh b/tests/integration/pipe-loopback-nanomsg.sh
index 2f2ffe733..f6aded6bf 100755
--- a/tests/integration/pipe-loopback-nanomsg.sh
+++ b/tests/integration/pipe-loopback-nanomsg.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-rtp-dual.sh b/tests/integration/pipe-loopback-rtp-dual.sh
index 6de543ea5..d041a3587 100755
--- a/tests/integration/pipe-loopback-rtp-dual.sh
+++ b/tests/integration/pipe-loopback-rtp-dual.sh
@@ -30,7 +30,7 @@ fi
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE_SRC=$(mktemp)
 CONFIG_FILE_DEST=$(mktemp)
diff --git a/tests/integration/pipe-loopback-rtp-tbf.sh b/tests/integration/pipe-loopback-rtp-tbf.sh
index 45bb5cb41..80ac24894 100755
--- a/tests/integration/pipe-loopback-rtp-tbf.sh
+++ b/tests/integration/pipe-loopback-rtp-tbf.sh
@@ -30,7 +30,7 @@ fi
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE_SRC=$(mktemp)
 CONFIG_FILE_DEST=$(mktemp)
diff --git a/tests/integration/pipe-loopback-rtp.sh b/tests/integration/pipe-loopback-rtp.sh
index 894d6eca5..4a3bb00f8 100755
--- a/tests/integration/pipe-loopback-rtp.sh
+++ b/tests/integration/pipe-loopback-rtp.sh
@@ -29,7 +29,7 @@ fi
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-socket.sh b/tests/integration/pipe-loopback-socket.sh
index 84a59aeb1..9ea103c4b 100755
--- a/tests/integration/pipe-loopback-socket.sh
+++ b/tests/integration/pipe-loopback-socket.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-loopback-websocket.sh b/tests/integration/pipe-loopback-websocket.sh
index 2b47a5dba..e62af21e6 100755
--- a/tests/integration/pipe-loopback-websocket.sh
+++ b/tests/integration/pipe-loopback-websocket.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 CONFIG_FILE2=$(mktemp)
diff --git a/tests/integration/pipe-loopback-zeromq.sh b/tests/integration/pipe-loopback-zeromq.sh
index cd92683fc..537a0177a 100755
--- a/tests/integration/pipe-loopback-zeromq.sh
+++ b/tests/integration/pipe-loopback-zeromq.sh
@@ -24,7 +24,7 @@
 
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
-source ${SCRIPTPATH}/../../tools/integration-tests-helper.sh
+source ${SCRIPTPATH}/../../tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/pipe-python-protobuf.sh b/tests/integration/pipe-python-protobuf.sh
index 7159e74ae..756322ff7 100755
--- a/tests/integration/pipe-python-protobuf.sh
+++ b/tests/integration/pipe-python-protobuf.sh
@@ -25,7 +25,7 @@
 SCRIPT=$(realpath $0)
 SCRIPTPATH=$(dirname ${SCRIPT})
 SRCDIR=$(realpath ${SCRIPTPATH}/../..)
-source ${SRCDIR}/tools/integration-tests-helper.sh
+source ${SRCDIR}/tools/villas-helper.sh
 
 CONFIG_FILE=$(mktemp)
 INPUT_FILE=$(mktemp)
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
new file mode 120000
index 000000000..33f51f9ce
--- /dev/null
+++ b/tests/integration/run.sh
@@ -0,0 +1 @@
+../../tools/integration-tests.sh
\ No newline at end of file
diff --git a/tools/integration-tests-helper.sh b/tools/villas-helper.sh
similarity index 100%
rename from tools/integration-tests-helper.sh
rename to tools/villas-helper.sh