Index: src/tests/preempt_longrun/Makefile.am
===================================================================
--- src/tests/preempt_longrun/Makefile.am	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/tests/preempt_longrun/Makefile.am	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -16,15 +16,14 @@
 
 repeats=10
-max_time=10
-N=10ul
+max_time=30
 preempt=10_000ul
 
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = create stack yield
+TESTS = barge block create disjoint processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}
Index: src/tests/preempt_longrun/Makefile.in
===================================================================
--- src/tests/preempt_longrun/Makefile.in	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/tests/preempt_longrun/Makefile.in	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -178,10 +178,9 @@
 top_srcdir = @top_srcdir@
 repeats = 10
-max_time = 10
-N = 10ul
+max_time = 30
 preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
-TESTS = create stack yield
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
+TESTS = barge block create disjoint processor stack wait yield
 all: all-am
 
Index: src/tests/preempt_longrun/barge.c
===================================================================
--- src/tests/preempt_longrun/barge.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
+++ src/tests/preempt_longrun/barge.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -0,0 +1,1 @@
+../sched-int-barge.c
Index: src/tests/preempt_longrun/block.c
===================================================================
--- src/tests/preempt_longrun/block.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
+++ src/tests/preempt_longrun/block.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -0,0 +1,1 @@
+../sched-int-block.c
Index: src/tests/preempt_longrun/disjoint.c
===================================================================
--- src/tests/preempt_longrun/disjoint.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
+++ src/tests/preempt_longrun/disjoint.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -0,0 +1,1 @@
+../sched-int-disjoint.c
Index: src/tests/preempt_longrun/wait.c
===================================================================
--- src/tests/preempt_longrun/wait.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
+++ src/tests/preempt_longrun/wait.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -0,0 +1,1 @@
+../sched-int-wait.c
Index: src/tests/sched-int-block.c
===================================================================
--- src/tests/sched-int-block.c	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/tests/sched-int-block.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -5,5 +5,7 @@
 #include <thread>
 
-static const unsigned N = 100_000;
+#ifndef N
+#define N 100_000
+#endif
 
 enum state_t { WAITED, SIGNAL, BARGE };
Index: src/tests/sched-int-disjoint.c
===================================================================
--- src/tests/sched-int-disjoint.c	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/tests/sched-int-disjoint.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -4,5 +4,7 @@
 #include <thread>
 
+#ifndef N
 #define N 100_000
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };
Index: src/tests/sched-int-wait.c
===================================================================
--- src/tests/sched-int-wait.c	(revision 6242335009c5d2ebee1bb50d1d228f5aacb0e5bd)
+++ src/tests/sched-int-wait.c	(revision a12d5aaf574b9eda122e096ee19ea16b8f778731)
@@ -5,5 +5,7 @@
 #include <thread>
 
-static const int N = 10_000;
+#ifndef N
+#define N 10_000
+#endif
 
 monitor global_t {};