diff --git a/test/Makefile.am b/test/Makefile.am
index fb478dbfb2..800cecf295 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,4 +5,4 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS		= support lam
+SUBDIRS		= support lam mpi
diff --git a/test/mpi/.cvsignore b/test/mpi/.cvsignore
new file mode 100644
index 0000000000..3dda72986f
--- /dev/null
+++ b/test/mpi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/test/mpi/Makefile.am b/test/mpi/Makefile.am
new file mode 100644
index 0000000000..a94f3a29e5
--- /dev/null
+++ b/test/mpi/Makefile.am
@@ -0,0 +1,8 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+SUBDIRS		= environment
diff --git a/test/mpi/environment/.cvsignore b/test/mpi/environment/.cvsignore
new file mode 100644
index 0000000000..abd44cbc95
--- /dev/null
+++ b/test/mpi/environment/.cvsignore
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.deps
+.gdb_history
+.libs
+chello
diff --git a/test/mpi/environment/Makefile.am b/test/mpi/environment/Makefile.am
new file mode 100644
index 0000000000..95a77784c8
--- /dev/null
+++ b/test/mpi/environment/Makefile.am
@@ -0,0 +1,17 @@
+# -*- makefile -*-
+#
+# $HEADER$
+#
+
+include $(top_srcdir)/config/Makefile.options
+
+AM_CPPFLAGS = -I$(top_srcdir)/test/support -DLAM_ENABLE_DEBUG=1
+
+noinst_PROGRAMS = chello
+
+chello_SOURCES = chello.c
+chello_LDADD = \
+	$(top_builddir)/src/libmpi.la \
+	$(top_builddir)/src/liblam.la
+chello_DEPENDENCIES = $(chello_LDADD)
+
diff --git a/test/mpi/environment/chello.c b/test/mpi/environment/chello.c
new file mode 100644
index 0000000000..58f580ec09
--- /dev/null
+++ b/test/mpi/environment/chello.c
@@ -0,0 +1,21 @@
+/* -*- C -*-
+ *
+ * $HEADER$
+ *
+ * The most basic of MPI applications
+ */
+
+#include <mpi.h>
+#include <stdio.h>
+
+int
+main(int argc, char* argv[])
+{
+  MPI_Init(&argc, &argv);
+
+  printf("Hello, World\n");
+
+  MPI_Finalize();
+
+  return 0;
+}