diff --git a/src/start.S b/src/start.S
index cbed1189a..683e79226 100644
--- a/src/start.S
+++ b/src/start.S
@@ -119,7 +119,6 @@ _begin:
 
 	bl _rom_data_init+.-base
 	msr     cpsr_c,#(SVC_MODE) // turn on interrupts --- for debug only	
- 	msr     cpsr_c,#(USR_MODE) // turn on interrupts --- for debug only
 //	swi
 	b main
 	
diff --git a/tests/tmr-ints.c b/tests/tmr-ints.c
index 1fc7fe024..f72222f40 100644
--- a/tests/tmr-ints.c
+++ b/tests/tmr-ints.c
@@ -122,6 +122,10 @@ void main(void) {
 
 //	enIRQ();
 
+	/* go into user mode to handle IRQs */
+	/* disabling interrupts is now difficult */
+ 	asm("msr     cpsr_c,#(0x10)");
+
 	while(1) {
 		/* sit here and let the interrupts do the work */
 	};