diff --git a/makefile b/makefile
index aef1e7fb34688afb3b0fd6fb4d3ff037c35abbea..99086cd494aa9c115b931a7e728b1f0d219f06df 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 = 30m
+TIMEOUT = 15m
 
 # Create a Directory to Run a Regression in
 $(eval REGRESSION_NAME =$(shell date +%Y_%m_%d_%H_%M_%S))
@@ -184,7 +184,7 @@ define mti_template
 .PHONY: $(1)
 mti_$(1):
 	@echo Starting Test $(1)
-	@timeout $(TIMEOUT) $(MAKE) -j1 run_mti TESTNAME=$(1) > $$(REGRESSION)/$(1).log
+	@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
 	@echo Finished Test $(1)
 endef
@@ -193,7 +193,7 @@ define xm_template
 .PHONY: $(1)
 xm_$(1):
 	@echo Starting Test $(1)
-	@timeout $(TIMEOUT) @$(MAKE) -j1 run_xm TESTNAME=$(1) > $$(REGRESSION)/$(1).log
+	@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
 	@echo Finished Test $(1)
 endef
@@ -202,7 +202,7 @@ define vcs_template
 .PHONY: $(1)
 vcs_$(1):
 	@echo Starting Test $(1)
-	@timeout $(TIMEOUT) @$(MAKE) -j1 run_vcs TESTNAME=$(1) > $$(REGRESSION)/$(1).log
+	@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
 	@echo Finished Test $(1)
 endef
diff --git a/testcodes/software_list.txt b/testcodes/software_list.txt
index 412e3c559a765a563ae5764810ab2b469378ee7e..52260e2e034dbf570c0a068062e02f9c50f29c10 100644
--- a/testcodes/software_list.txt
+++ b/testcodes/software_list.txt
@@ -1,11 +1,11 @@
+rtx_demo
+gpio_tests
 hello
 dhry
 sleep_demo
 dualtimer_demo
 self_reset_demo
 watchdog_demo
-rtx_demo
-gpio_tests
 timer_tests
 debug_tests
 default_slaves_tests