diff --git a/Makefile b/Makefile
index 2c972bc..0a71aea 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
 #	CppUTest built with extensions
 #	CPPUTEST_HOME defined
 	
+export CPPUTEST_WARNINGFLAGS += -Wno-reserved-id-macro -Wno-keyword-macro
+
 all: 
 	make -i -C code
 	make -i -C code-t0
diff --git a/code/tests/HomeAutomation/FakeTimeService.c b/code/tests/HomeAutomation/FakeTimeService.c
index 1e3ae7c..daf6d0a 100644
--- a/code/tests/HomeAutomation/FakeTimeService.c
+++ b/code/tests/HomeAutomation/FakeTimeService.c
@@ -45,8 +45,9 @@ void TimeService_Destroy(void)
 
 void FakeTimeService_MinuteIsUp(void)
 {
-    if (callback != NULL);
+    if (callback != NULL) {
         callback();
+    }
 }
 
 void TimeService_SetPeriodicAlarmInSeconds(int seconds, WakeupCallback cb)
diff --git a/code/unity/HomeAutomation/FakeTimeService.c b/code/unity/HomeAutomation/FakeTimeService.c
index 5e393ad..62bd9f5 100644
--- a/code/unity/HomeAutomation/FakeTimeService.c
+++ b/code/unity/HomeAutomation/FakeTimeService.c
@@ -45,8 +45,9 @@ void TimeService_Destroy(void)
 
 void FakeTimeService_MinuteIsUp(void)
 {
-    if (callback != NULL);
+    if (callback != NULL) {
         callback();
+    }
 }
 
 void TimeService_SetPeriodicAlarmInSeconds(int seconds, WakeupCallback cb)