diff --git a/configure.ac b/configure.ac
index 38a6594e2c..54bda661ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -877,6 +877,7 @@ AC_CONFIG_FILES([
     src/rte/universe/Makefile
 
     test/Makefile
+    test/include/Makefile
     test/support/Makefile
     test/class/Makefile
     test/threads/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 05b324c836..019dd96ce2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,7 +5,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS		= support class util threads include 
+SUBDIRS		= support class util threads 
 # JMS Temporary hack to make "make dist" work.  The directories mentioned
 # here will eventually moved into SUBDIRS.
-DIST_SUBDIRS = $(SUBDIRS) rte 
+DIST_SUBDIRS = $(SUBDIRS) rte include 
diff --git a/test/include/Makefile.am b/test/include/Makefile.am
index ebbcbe9abc..b5c318e0cd 100644
--- a/test/include/Makefile.am
+++ b/test/include/Makefile.am
@@ -10,6 +10,6 @@ noinst_PROGRAMS = \
         atomic
 
 atomic_SOURCES = atomic.c 
-ompi_bitmap_LDADD = \
+atomic_LDADD = \
         $(top_builddir)/test/support/libsupport.la
-ompi_bitmap_DEPENDENCIES = $(ompi_bitmap_LDADD)
+atomic_DEPENDENCIES = $(ompi_bitmap_LDADD)