diff --git a/Makefile b/Makefile
index 0655077f50716f4519dbaf3334d3cf7086872021..d667b5262dd81f2620f232a0889b28f649b40b07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL                 := /bin/bash
 
-PARALLEL_FLAGS        ?= --halt now,fail=1 --jobs=2 -v -u
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs=2 -v -u
 
 TEST_FLAGS            ?=
 
@@ -29,11 +29,7 @@ test-libs:
 			lib \
 			internal
 
-test-adapters:
-	for MAKEFILE in $$(grep -Rl test-extended */Makefile | sort -u); do \
-		ADAPTER=$$(dirname $$MAKEFILE); \
-		($(MAKE) test-adapter-$$ADAPTER || exit 1); \
-	done
+test-adapters: test-adapter-mysql test-adapter-mssql test-adapter-sqlite test-adapter-ql test-adapter-mongo
 
 test-adapter-%:
 	($(MAKE) -C $* test-extended || exit 1)
diff --git a/mongo/Makefile b/mongo/Makefile
index 76aa66e6f41adc520ac0e0466cc3b1fd541e5bb8..c677a145bfd6676e3d02dbc6b7a195fb4cb161cd 100644
--- a/mongo/Makefile
+++ b/mongo/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MONGO_VERSION
 
diff --git a/mssql/Makefile b/mssql/Makefile
index 08a0f8bb563ade5a318fd460f3957505120d0f38..b65789c1d3594c0cfc767a2878457e477c54367f 100644
--- a/mssql/Makefile
+++ b/mssql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= sa
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MSSQL_VERSION
 
@@ -29,7 +29,7 @@ test:
 
 server-up: server-down
 	docker-compose -p $(PROJECT) up -d && \
-	sleep 10
+	sleep 15
 
 server-down:
 	docker-compose -p $(PROJECT) down
diff --git a/mysql/Makefile b/mysql/Makefile
index 8e48693ec55a9ff7c720405c5c49b48d296e305c..02f8a25549e4f0cffdeff8c7bf7aa79ff12f6dfd 100644
--- a/mysql/Makefile
+++ b/mysql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export MYSQL_VERSION
 
diff --git a/postgresql/Makefile b/postgresql/Makefile
index 63f24f2abcf7b8c7b133f7b978b43e497d4f8590..6638f5e16f65933e77e71b01b820f4cbd2b8d9e9 100644
--- a/postgresql/Makefile
+++ b/postgresql/Makefile
@@ -12,7 +12,7 @@ DB_USERNAME           ?= upperio_user
 DB_PASSWORD           ?= upperio//s3cr37
 
 TEST_FLAGS            ?=
-PARALLEL_FLAGS        ?=
+PARALLEL_FLAGS        ?= --halt-on-error 2 --jobs 1
 
 export POSTGRES_VERSION