diff --git a/.circleci/config.yml b/.circleci/config.yml
index db3efe0..71f3720 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
             sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev
       - run:
           name: "Build"
-          command: "make -j 3"
+          command: "make -j 3 dstargateway tests"
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
diff --git a/Makefile b/Makefile
index a768147..e855986 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ OBJS = $(SRCS:.cpp=.o)
 DEPS = $(SRCS:.cpp=.d)
 
 .PHONY: all
-all: dstargateway tests
+all: dstargateway
 
 dstargateway : GitVersion.h $(OBJS) 
 	$(CC) $(CPPFLAGS) -o dstargateway $(OBJS) $(LDFLAGS)
diff --git a/Tests/Makefile b/Tests/Makefile
index 18c1255..c8d2dca 100644
--- a/Tests/Makefile
+++ b/Tests/Makefile
@@ -16,7 +16,7 @@ tests: rmdstargatewayapp $(OBJS)
 clean :
 	@$(RM) $(OBJS) $(DEPS) dstargateway_tests
 
-
+# Again ugly trick to force rebuild of DStarGatewayApp
 .PHONY rmdstargatewayapp :
 rmdstargatewayapp: FORCE
 	@$(RM) ../DStarGatewayApp.o