diff --git a/.circleci/config.yml b/.circleci/config.yml
index 71f3720..4409f38 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,8 +20,11 @@ jobs:
             sudo apt-get update
             sudo apt-get -y install libgtest-dev libcurl4-openssl-dev libboost-dev
       - run:
-          name: "Build"
-          command: "make -j 3 dstargateway tests"
+          name: "Build App"
+          command: "make -j 3 dstargateway"
+      - run:
+          name: "Build Tests"
+          command: "make -j 3 tests"
 
 # Invoke jobs via workflows
 # See: https://circleci.com/docs/2.0/configuration-reference/#workflows
diff --git a/Makefile b/Makefile
index e855986..a0eab61 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,9 @@ removehostfiles :
 	@rm -f $(DATA_DIR)/DPlus_Hosts.txt
 
 .PHONY tests:
-tests : GitVersion.h $(OBJS) 
-	$(MAKE) -C Tests tests
+tests : GitVersion.h
+	@$(RM) -f DStarGatewayApp.o
+	@$(RM) -f DStarGatewayApp.d
+	@$(MAKE) -C Tests tests
 
 FORCE:
\ No newline at end of file
diff --git a/Tests/Makefile b/Tests/Makefile
index c8d2dca..155361a 100644
--- a/Tests/Makefile
+++ b/Tests/Makefile
@@ -4,7 +4,7 @@ OBJS = $(SRCS:.cpp=.o)
 DEPS = $(SRCS:.cpp=.d)
 
 .PHONY tests:
-tests: rmdstargatewayapp $(OBJS)
+tests: $(OBJS)
 	$(CC) $(CPPFLAGS) -o dstargateway_tests $(OBJS) $(LDFLAGS) -lgtest -lgtest_main
 
 %.o : %.cpp
@@ -16,10 +16,3 @@ tests: rmdstargatewayapp $(OBJS)
 clean :
 	@$(RM) $(OBJS) $(DEPS) dstargateway_tests
 
-# Again ugly trick to force rebuild of DStarGatewayApp
-.PHONY rmdstargatewayapp :
-rmdstargatewayapp: FORCE
-	@$(RM) ../DStarGatewayApp.o
-	@$(RM) ../DStarGatewayApp.d
-
-FORCE:
\ No newline at end of file