diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39242f496c..856a79507b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,6 @@ jobs:
     steps:
       - checkout # check out source code to working directory
       - run:
-          command: make bor
+          command: make all
       - run:
           command: make test
diff --git a/Makefile b/Makefile
index 5cd23bbe5e..ab2b52aa12 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ ios:
 	@echo "Import \"$(GOBIN)/bor.framework\" to use the library."
 
 test: bor
-	go test github.com/maticnetwork/bor/consensus/bor_test
+	go test github.com/maticnetwork/bor/consensus/bor/bor_test
 
 lint: ## Run linters.
 	$(GORUN) build/ci.go lint