diff --git a/tests/runtest b/tests/runtest
new file mode 100644
index 000000000..dec3ee0cb
--- /dev/null
+++ b/tests/runtest
@@ -0,0 +1,16 @@
+#!/bin/sh
+TCL_VERSIONS="8.5 8.6"
+TCLSH=""
+
+export ASAN_OPTIONS=allocator_may_return_null=1  $ASAN_OPTIONS
+
+for VERSION in $TCL_VERSIONS; do
+	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
+done
+
+if [ -z $TCLSH ]
+then
+    echo "You need tcl 8.5 or newer in order to run the KeyDB test"
+    exit 1
+fi
+$TCLSH tests/test_helper.tcl "${@}"
diff --git a/tests/runtest-cluster b/tests/runtest-cluster
new file mode 100644
index 000000000..3a6d20978
--- /dev/null
+++ b/tests/runtest-cluster
@@ -0,0 +1,14 @@
+#!/bin/sh
+TCL_VERSIONS="8.5 8.6"
+TCLSH=""
+
+for VERSION in $TCL_VERSIONS; do
+	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
+done
+
+if [ -z $TCLSH ]
+then
+    echo "You need tcl 8.5 or newer in order to run the KeyDB Cluster test"
+    exit 1
+fi
+$TCLSH tests/cluster/run.tcl $*
diff --git a/tests/runtest-moduleapi b/tests/runtest-moduleapi
new file mode 100644
index 000000000..4f0bca851
--- /dev/null
+++ b/tests/runtest-moduleapi
@@ -0,0 +1,42 @@
+#!/bin/sh
+TCL_VERSIONS="8.5 8.6"
+TCLSH=""
+[ -z "$MAKE" ] && MAKE=make
+
+for VERSION in $TCL_VERSIONS; do
+	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
+done
+
+if [ -z $TCLSH ]
+then
+    echo "You need tcl 8.5 or newer in order to run the KeyDB ModuleApi test"
+    exit 1
+fi
+
+$MAKE -C tests/modules && \
+$TCLSH tests/test_helper.tcl \
+--single unit/moduleapi/commandfilter \
+--single unit/moduleapi/basics \
+--single unit/moduleapi/fork \
+--single unit/moduleapi/testrdb \
+--single unit/moduleapi/infotest \
+--single unit/moduleapi/propagate \
+--single unit/moduleapi/hooks \
+--single unit/moduleapi/misc \
+--single unit/moduleapi/blockonkeys \
+--single unit/moduleapi/blockonbackground \
+--single unit/moduleapi/scan \
+--single unit/moduleapi/datatype \
+--single unit/moduleapi/auth \
+--single unit/moduleapi/keyspace_events \
+--single unit/moduleapi/blockedclient \
+--single unit/moduleapi/moduleloadsave \
+--single unit/moduleapi/getkeys \
+--single unit/moduleapi/test_lazyfree \
+--single unit/moduleapi/defrag \
+--single unit/moduleapi/hash \
+--single unit/moduleapi/zset \
+--single unit/moduleapi/stream \
+--single unit/moduleapi/load \
+--config server-threads 3 \
+"${@}"
diff --git a/tests/runtest-rotation b/tests/runtest-rotation
new file mode 100644
index 000000000..7151f752d
--- /dev/null
+++ b/tests/runtest-rotation
@@ -0,0 +1,31 @@
+#!/bin/sh
+TCL_VERSIONS="8.5 8.6"
+TCLSH=""
+
+export ASAN_OPTIONS=allocator_may_return_null=1  $ASAN_OPTIONS
+
+for VERSION in $TCL_VERSIONS; do
+	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
+done
+
+if [ -z $TCLSH ]
+then
+    echo "You need tcl 8.5 or newer in order to run the KeyDB test"
+    exit 1
+fi
+if [ ! -r tests/tls ] || [ ! -r tests/tls_1 ] || [ ! -r tests/tls_2 ];
+then
+    echo "Generating neccessary certificates for TLS rotation testing."
+    rm -rf tests/tls tests/tls_1 tests/tls_2
+
+    utils/gen-test-certs.sh
+    mv tests/tls tests/tls_1
+    utils/gen-test-certs.sh
+    mv tests/tls tests/tls_2
+    utils/gen-test-certs.sh
+fi
+$TCLSH tests/test_helper.tcl \
+--single unit/tls-rotation \
+--tls \
+--config server-threads 3 \
+"${@}"