diff --git a/makefile b/makefile
index 37ff16597efaf8ff1f6c3935529c2da0d6210daf..0fc536715699893f2e5937ddd90d1376d37759ed 100644
--- a/makefile
+++ b/makefile
@@ -168,7 +168,7 @@ SW_MAKE_OPTIONS = CPU_PRODUCT=$(CPU_PRODUCT) TOOL_CHAIN=$(TOOL_CHAIN)
 PARALLEL_TESTS = 4
 
 # Regression Simulation Timeout
-TIMEOUT = 20m
+TIMEOUT = 5m
 
 # Create a Directory to Run a Regression in
 $(eval REGRESSION_NAME =$(shell date +%Y_%m_%d_%H_%M_%S))
@@ -185,7 +185,7 @@ define mti_template
 mti_$(1):
 	@echo Starting Test $(1)
 	@timeout $(TIMEOUT) $(MAKE) -j1 run_mti TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
-	@if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
+	@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
 	@echo Finished Test $(1)
 endef
 
@@ -194,7 +194,7 @@ define xm_template
 xm_$(1):
 	@echo Starting Test $(1)
 	@timeout $(TIMEOUT) $(MAKE) -j1 run_xm TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
-	@if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
+	@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
 	@echo Finished Test $(1)
 endef
 
@@ -203,7 +203,7 @@ define vcs_template
 vcs_$(1):
 	@echo Starting Test $(1)
 	@timeout $(TIMEOUT) $(MAKE) -j1 run_vcs TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
-	@if cat $$(REGRESSION)/$(1).log | grep -i "Test Passed"; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i "Test Skipped"; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
+	@if cat $$(REGRESSION)/$(1).log | grep -i " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
 	@echo Finished Test $(1)
 endef