diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 0229e75001b8d3f8f33846df2052a0f9955cc486..b313a8cd49fea01109ed8e06b99889deac412479 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -53,6 +53,7 @@ if [file exists globals.local] {
 # Used to locate binaries, libraries, and header files.
 #
 cset slurm_dir   "/usr"
+cset build_dir   "../../"
 cset sacct       "${slurm_dir}/bin/sacct"
 cset salloc      "${slurm_dir}/bin/salloc"
 cset sattach     "${slurm_dir}/bin/sattach"
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 6778c1dc3171786ccd0ba48c02297ecdc0a3dd45..da1a4aa8501a363fc6bc6161d6449665d7230cad 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -64,7 +64,7 @@ send_user "\ntask affinity plugin installed\n"
 # Build a test program to report affinity by task
 #
 exec $bin_rm -f $file_prog
-exec $bin_make -f /dev/null $file_prog
+exec $bin_cc -I$build_dir $file_prog.c -o $file_prog
 exec $bin_chmod 700 $file_prog
 
 #
diff --git a/testsuite/expect/test1.89.prog.c b/testsuite/expect/test1.89.prog.c
index bcd2c40ec02dfa8477fc0d1026e238c216fcc168..46828790188dd6a3e39c9d0198bb0db53572b3a0 100644
--- a/testsuite/expect/test1.89.prog.c
+++ b/testsuite/expect/test1.89.prog.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../config.h"
+#include "config.h"
 
 static void _load_mask(cpu_set_t *mask)
 {
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index 3b5d65ffc540c3ecc55f76f271ac0d295ae051a1..f091f175e2c09d0d63bb84843ce647fc85156f01 100644
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -93,7 +93,7 @@ send_user "Node config: Sockets=$num_sockets Cores=$num_cores Threads=$num_threa
 # Build a test program to report affinity by task
 #
 exec $bin_rm -f $file_prog
-exec $bin_make -f /dev/null $file_prog
+exec $bin_cc -I$build_dir $file_prog.c -o $file_prog
 exec $bin_chmod 700 $file_prog
 
 #
diff --git a/testsuite/expect/test1.91.prog.c b/testsuite/expect/test1.91.prog.c
index bcd2c40ec02dfa8477fc0d1026e238c216fcc168..46828790188dd6a3e39c9d0198bb0db53572b3a0 100644
--- a/testsuite/expect/test1.91.prog.c
+++ b/testsuite/expect/test1.91.prog.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "../../config.h"
+#include "config.h"
 
 static void _load_mask(cpu_set_t *mask)
 {