diff --git a/.gitignore b/.gitignore
index 2d6cc543a..d2e676e14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,3 +163,6 @@ heaptrack.*
 .cproject
 .project
 .settings/
+
+#tap tests
+*-t
diff --git a/test/tap/run-sim.sh b/test/tap/run-sim.sh
new file mode 100755
index 000000000..c2d874a56
--- /dev/null
+++ b/test/tap/run-sim.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+TAP_HOST="${TAP_HOST:=127.0.0.1}"
+TAP_PORT="${TAP_PORT:=6033}"
+TAP_USERNAME="${TAP_USERNAME:=root}"
+TAP_PASSWORD="${TAP_PASSWORD:=a}"
+
+export TAP_HOST
+export TAP_PORT
+export TAP_USERNAME
+export TAP_PASSWORD
+
+ret=`prove --ext -sim ./tests/`
+echo "$ret"
+
+if [[ $ret == *"FAIL"* ]]; then
+	exit 1
+fi
+
+
diff --git a/test/tap/run-t.sh b/test/tap/run-t.sh
new file mode 100755
index 000000000..c4d132c78
--- /dev/null
+++ b/test/tap/run-t.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+TAP_HOST="${TAP_HOST:=127.0.0.1}"
+TAP_PORT="${TAP_PORT:=6033}"
+TAP_USERNAME="${TAP_USERNAME:=root}"
+TAP_PASSWORD="${TAP_PASSWORD:=a}"
+
+export TAP_HOST
+export TAP_PORT
+export TAP_USERNAME
+export TAP_PASSWORD
+
+ret=`prove --ext -t ./tests/`
+echo "$ret"
+
+if [[ $ret == *"FAIL"* ]]; then
+	exit 1
+fi
+
+
diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile
index 0e5f75582..056390377 100644
--- a/test/tap/tests/Makefile
+++ b/test/tap/tests/Makefile
@@ -74,13 +74,13 @@ all: tests
 
 .PHONY: clean
 clean:
-	rm -f basic-t set_character_set-t charset_unsigned_int-t select_config_file-t sqlite3-t galera_1_timeout_count-t galera_2_timeout_no_count-t aurora-t || true
+	rm -f basic-t set_character_set-t charset_unsigned_int-t select_config_file-t sqlite3-t galera_1_timeout_count galera_2_timeout_no_count aurora || true
 
 OPT=-O2
 
-SRC=basic-t.cpp set_character_set-t.cpp charset_unsigned_int-t.cpp select_config_file-t.cpp sqlite3-t.cpp  galera_1_timeout_count-t.cpp galera_2_timeout_no_count-t.cpp aurora-t.cpp
+SRC=basic-t.cpp set_character_set-t.cpp charset_unsigned_int-t.cpp select_config_file-t.cpp sqlite3-t.cpp  galera_1_timeout_count.cpp galera_2_timeout_no_count.cpp aurora.cpp
 
-tests: basic-t set_character_set-t charset_unsigned_int-t select_config_file-t sqlite3-t  galera_1_timeout_count-t galera_2_timeout_no_count-t aurora-t
+tests: basic-t set_character_set-t charset_unsigned_int-t select_config_file-t sqlite3-t  galera_1_timeout_count galera_2_timeout_no_count aurora
 
 sqlite3-t: $(LIBDIR)/libtap.a sqlite3-t.cpp
 	g++ sqlite3-t.cpp -I$(INCLUDEDIR) -I$(PROXYSQL_IDIR) -I$(MARIADB_IDIR) -I$(SQLITE3_DIR) -L$(LIBDIR) $(OPT) ../../../lib/libproxysql.a -lpthread -ldl -std=c++11 -ltap -o sqlite3-t
@@ -94,14 +94,14 @@ set_character_set-t: set_character_set-t.cpp $(TAP_LIBDIR)/libtap.a
 charset_unsigned_int-t: charset_unsigned_int-t.cpp $(TAP_LIBDIR)/libtap.a
 	g++ charset_unsigned_int-t.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 -ltap -ldl $(MYLIBS) -o charset_unsigned_int-t
 
-galera_1_timeout_count-t: galera_1_timeout_count-t.cpp $(TAP_LIBDIR)/libtap.a
-	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG galera_1_timeout_count-t.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_1_timeout_count-t -DGITVERSION=\"$(GIT_VERSION)\"
+galera_1_timeout_count: galera_1_timeout_count.cpp $(TAP_LIBDIR)/libtap.a
+	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG galera_1_timeout_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_1_timeout_count -DGITVERSION=\"$(GIT_VERSION)\"
 
-galera_2_timeout_no_count-t: galera_2_timeout_no_count-t.cpp $(TAP_LIBDIR)/libtap.a
-	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG galera_2_timeout_no_count-t.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_2_timeout_no_count-t -DGITVERSION=\"$(GIT_VERSION)\"
+galera_2_timeout_no_count: galera_2_timeout_no_count.cpp $(TAP_LIBDIR)/libtap.a
+	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG galera_2_timeout_no_count.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o galera_2_timeout_no_count -DGITVERSION=\"$(GIT_VERSION)\"
 
-aurora-t: aurora-t.cpp $(TAP_LIBDIR)/libtap.a
-	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG aurora-t.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o aurora-t -DGITVERSION=\"$(GIT_VERSION)\"
+aurora: aurora.cpp $(TAP_LIBDIR)/libtap.a
+	g++ -DTEST_GALERA -DTEST_AURORA -DTEST_GROUPREP -DDEBUG aurora.cpp ../tap/SQLite3_Server.cpp $(INCLUDEDIR) $(LDIRS) $(OPT) -std=c++11 $(OBJ) $(MYLIBS) -ltap -ldl -o aurora -DGITVERSION=\"$(GIT_VERSION)\"
 
 select_config_file-t: select_config_file-t.cpp $(LIBDIR)/libtap.a
 	g++ select_config_file-t.cpp -I$(INCLUDEDIR) -L$(LIBDIR) -std=c++11 `mysql_config --include --libs` -lmysqlclient -ltap -o select_config_file-t
diff --git a/test/tap/tests/aurora-t.cpp b/test/tap/tests/aurora.cpp
similarity index 100%
rename from test/tap/tests/aurora-t.cpp
rename to test/tap/tests/aurora.cpp
diff --git a/test/tap/tests/galera_1-sim b/test/tap/tests/galera_1-sim
new file mode 100755
index 000000000..92bf9541d
--- /dev/null
+++ b/test/tap/tests/galera_1-sim
@@ -0,0 +1,3 @@
+#!/bin/bash
+./tests/galera_1_timeout_count --sqlite3-server -f 2>/dev/null
+
diff --git a/test/tap/tests/galera_1_timeout_count-t.cpp b/test/tap/tests/galera_1_timeout_count.cpp
similarity index 100%
rename from test/tap/tests/galera_1_timeout_count-t.cpp
rename to test/tap/tests/galera_1_timeout_count.cpp
diff --git a/test/tap/tests/galera_2-sim b/test/tap/tests/galera_2-sim
new file mode 100755
index 000000000..7cabcd779
--- /dev/null
+++ b/test/tap/tests/galera_2-sim
@@ -0,0 +1,3 @@
+#!/bin/bash
+./tests/galera_2_timeout_no_count --sqlite3-server -f 2>/dev/null
+
diff --git a/test/tap/tests/galera_2_timeout_no_count-t.cpp b/test/tap/tests/galera_2_timeout_no_count.cpp
similarity index 100%
rename from test/tap/tests/galera_2_timeout_no_count-t.cpp
rename to test/tap/tests/galera_2_timeout_no_count.cpp