Index: src/tests/preempt_longrun/Makefile.am
===================================================================
--- src/tests/preempt_longrun/Makefile.am	(revision 667c7da24d1364ab0116bfde1d2ec197a3e972b4)
+++ src/tests/preempt_longrun/Makefile.am	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -26,5 +26,5 @@
 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 667c7da24d1364ab0116bfde1d2ec197a3e972b4)
+++ src/tests/preempt_longrun/Makefile.in	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -183,5 +183,5 @@
 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
+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 e1c182961b8966ab4842550db21657c05da7715c)
+++ src/tests/preempt_longrun/barge.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -0,0 +1,1 @@
+../sched-int-barge.c
Index: src/tests/preempt_longrun/block.c
===================================================================
--- src/tests/preempt_longrun/block.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
+++ src/tests/preempt_longrun/block.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -0,0 +1,1 @@
+../sched-int-block.c
Index: src/tests/preempt_longrun/disjoint.c
===================================================================
--- src/tests/preempt_longrun/disjoint.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
+++ src/tests/preempt_longrun/disjoint.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -0,0 +1,1 @@
+../sched-int-disjoint.c
Index: src/tests/preempt_longrun/wait.c
===================================================================
--- src/tests/preempt_longrun/wait.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
+++ src/tests/preempt_longrun/wait.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -0,0 +1,1 @@
+../sched-int-wait.c
Index: src/tests/sched-int-block.c
===================================================================
--- src/tests/sched-int-block.c	(revision 667c7da24d1364ab0116bfde1d2ec197a3e972b4)
+++ src/tests/sched-int-block.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -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 667c7da24d1364ab0116bfde1d2ec197a3e972b4)
+++ src/tests/sched-int-disjoint.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -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 667c7da24d1364ab0116bfde1d2ec197a3e972b4)
+++ src/tests/sched-int-wait.c	(revision e1c182961b8966ab4842550db21657c05da7715c)
@@ -5,5 +5,7 @@
 #include <thread>
 
-static const int N = 10_000;
+#ifndef N
+#define N 10_000
+#endif
 
 monitor global_t {};