diff --git a/Makefile b/Makefile
index 9241da6b81c640bf428feee79b3de8ea0d59ba2f..546890212173e075f2eb022b13362ae929224892 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CFLAGS = -g -O0 -Wall
 
-all: swiftmpistepsim swiftmpiproxies
+all: swiftmpistepsim swiftmpiproxies exchange-test
 
 swiftmpistepsim: swiftmpistepsim.c mpiuse.c mpiuse.h atomic.h cycle.h clocks.h clocks.c
 	$(CC) $(CFLAGS) -o swiftmpistepsim swiftmpistepsim.c mpiuse.c clocks.c -I/usr/include/mpi -lmpi -lpthread
@@ -8,6 +8,10 @@ swiftmpistepsim: swiftmpistepsim.c mpiuse.c mpiuse.h atomic.h cycle.h clocks.h c
 swiftmpiproxies: swiftmpiproxies.c mpiuse.c mpiuse.h atomic.h cycle.h clocks.h clocks.c
 	$(CC) $(CFLAGS) -o swiftmpiproxies swiftmpiproxies.c mpiuse.c clocks.c -I/usr/include/mpi -lmpi -lpthread
 
+exchange-test: exchange-test.c
+	$(CC) $(CFLAGS) -o exchange-test exchange-test.c -I/usr/include/mpi -lmpi -lpthread
+
 clean:
 	rm -f swiftmpistepsim
 	rm -f swiftmpiproxies
+	rm -f exchange-test