Index: src/libcfa/concurrency/coroutine.c
===================================================================
--- src/libcfa/concurrency/coroutine.c	(revision 4dad189a196ef0b69c88f13342f963639c2ed7df)
+++ src/libcfa/concurrency/coroutine.c	(revision 827a1905dca8a3022e4811fbdb84399f533a55d8)
@@ -99,5 +99,5 @@
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-	// THREAD_GETMEM( This )->disableInterrupts();
+	disable_interrupts();
 
 	// set state of current coroutine to inactive
@@ -115,5 +115,5 @@
 	src->state = Active;
 
-	// THREAD_GETMEM( This )->enableInterrupts();
+	enable_interrupts( __cfaabi_dbg_ctx );
 } //ctxSwitchDirect
 
Index: src/tests/preempt_longrun/Makefile.am
===================================================================
--- src/tests/preempt_longrun/Makefile.am	(revision 4dad189a196ef0b69c88f13342f963639c2ed7df)
+++ src/tests/preempt_longrun/Makefile.am	(revision 827a1905dca8a3022e4811fbdb84399f533a55d8)
@@ -18,13 +18,14 @@
 max_time=600
 preempt=1_000ul
+debug=-debug
 
 REPEAT = ${abs_top_srcdir}/tools/repeat
 TIME = /usr/bin/time -f "%E"
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = block create disjoint enter enter3 processor stack wait yield
+TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}
@@ -36,5 +37,5 @@
 
 % : %.c ${CC}
-	${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
+	${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 
 %.run : % ${REPEAT}
Index: src/tests/preempt_longrun/Makefile.in
===================================================================
--- src/tests/preempt_longrun/Makefile.in	(revision 4dad189a196ef0b69c88f13342f963639c2ed7df)
+++ src/tests/preempt_longrun/Makefile.in	(revision 827a1905dca8a3022e4811fbdb84399f533a55d8)
@@ -451,8 +451,9 @@
 max_time = 600
 preempt = 1_000ul
+debug = -debug
 REPEAT = ${abs_top_srcdir}/tools/repeat
 TIME = /usr/bin/time -f "%E"
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
-TESTS = block create disjoint enter enter3 processor stack wait yield
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt}
+TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 all: all-am
 
@@ -643,4 +644,11 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+coroutine.log: coroutine
+	@p='coroutine'; \
+	b='coroutine'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 create.log: create
 	@p='create'; \
@@ -873,5 +881,5 @@
 
 % : %.c ${CC}
-	${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
+	${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 
 %.run : % ${REPEAT}
Index: src/tests/preempt_longrun/coroutine.c
===================================================================
--- src/tests/preempt_longrun/coroutine.c	(revision 827a1905dca8a3022e4811fbdb84399f533a55d8)
+++ src/tests/preempt_longrun/coroutine.c	(revision 827a1905dca8a3022e4811fbdb84399f533a55d8)
@@ -0,0 +1,1 @@
+../concurrent/coroutineYield.c