diff --git a/Makefile b/Makefile
index bf09bbb..7739fea 100644
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,15 @@ format: check-py-deps ## Format the project
 test: check-deps test-unit test-acceptance ## Run unit and acceptance tests
 
 test-unit: check-deps ## Run all tests once or specify a file/test with TEST=tests/file.py::Class::test
-	@$(DC) up -d bdb
-	@$(DC) exec planetmint pytest ${TEST}
+	@$(DC) up -d tarantool
+	#wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz
+	#tar zxf tendermint_0.34.15_linux_amd64.tar.gz
+	pytest -m "not abci"
+	rm -rf ~/.tendermint && ./tendermint init && ./tendermint node --consensus.create_empty_blocks=false --rpc.laddr=tcp://0.0.0.0:26657 --proxy_app=tcp://localhost:26658&
+	pytest -m abci
+	@$(DC) down
+
+
 
 test-unit-watch: check-deps ## Run all tests and wait. Every time you change code, tests will be run again
 	@$(DC) run --rm --no-deps planetmint pytest -f