diff --git a/testsuite/slurm_unit/slurmd/Makefile.am b/testsuite/slurm_unit/slurmd/Makefile.am
index 5f3b13e4f783bc4d41b44360df51983a860b75dd..7cf53e5a09079a39b3aaee9e38a2f6298aa8e907 100644
--- a/testsuite/slurm_unit/slurmd/Makefile.am
+++ b/testsuite/slurm_unit/slurmd/Makefile.am
@@ -2,6 +2,12 @@ AUTOMAKE_OPTIONS = foreign
 
 noinst_PROGRAMS = task_mgr-test circular_buffer-test task_launch-test credential_util-test
 
+if WITH_ELAN
+interconnect_lib = $(top_srcdir)/src/slurmd/libelan_interconnect.a
+else
+interconnect_lib = $(top_srcdir)/src/slurmd/libno_interconnect.a
+endif
+
 
 INCLUDES = -I$(top_srcdir)/src/common
 LDADD   = $(top_srcdir)/src/common/libcommon.la \
@@ -12,5 +18,6 @@ LDADD   = $(top_srcdir)/src/common/libcommon.la \
 	$(top_srcdir)/src/slurmd/signature_utils.o \
 	$(top_srcdir)/src/slurmd/io.o \
 	$(top_srcdir)/src/slurmd/pipes.o \
-	$(SSL_LIBS)
+	$(SSL_LIBS) \
+	$(interconnect_lib)
 
diff --git a/testsuite/slurm_unit/slurmd/testme b/testsuite/slurm_unit/slurmd/testme
index 322e7622fc2d32882ee04ac1803909bafc85b698..9da8b564e40b0c6892018a3b4cffb6e1c0074bf6 100755
--- a/testsuite/slurm_unit/slurmd/testme
+++ b/testsuite/slurm_unit/slurmd/testme
@@ -1,7 +1,5 @@
 #!/usr/bin/perl
 
-while(1)
-{
 open OUT, ">test.out" ;
 print OUT `date`;
 print "TESTING\n" ;
@@ -31,4 +29,3 @@ print OUT "ONOTESTING\n" ;
 print OUT "ONOTESTING\n" ;
 print OUT "ONOTESTING\n" ;
 close OUT ;
-}