diff --git a/programs/Makefile b/programs/Makefile
index 00f66dc..c9ec1e7 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -7,6 +7,7 @@ SUBDIRS =			\
 	aio_direct		\
 	basic-dual-data		\
 	bonnie			\
+	buildkernel		\
 	create_and_open		\
 	create_files		\
 	create_racer		\
@@ -28,6 +29,7 @@ SUBDIRS =			\
 	mmap_test		\
 	multi_node_mmap		\
 	parallel_timing		\
+	python_common		\
 	quick_appending_writes	\
 	sendfiletest		\
 	splice			\
diff --git a/programs/aio-stress/Makefile b/programs/aio-stress/Makefile
index 3296cdd..57d3a66 100644
--- a/programs/aio-stress/Makefile
+++ b/programs/aio-stress/Makefile
@@ -3,6 +3,7 @@ TOPDIR = ../..
 include $(TOPDIR)/Preamble.make
 
 TESTS = aio-stress
+BIN_PROGRAMS = aio-stress
 
 CFLAGS = -O2 -Wall -g
 LDFLAGS += -laio -lpthread
@@ -15,5 +16,4 @@ DIST_FILES = $(SOURCES)
 truncate: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/aio_direct/Makefile b/programs/aio_direct/Makefile
index 7351d2d..60c4c5f 100644
--- a/programs/aio_direct/Makefile
+++ b/programs/aio_direct/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = partial_aio_direct
+
 partial_aio_direct: $(OBJECTS)
 	$(LINK) -laio
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/create_and_open/Makefile b/programs/create_and_open/Makefile
index 2971490..ec5f1c9 100644
--- a/programs/create_and_open/Makefile
+++ b/programs/create_and_open/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = create_and_open
+
 create_and_open: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/create_racer/Makefile b/programs/create_racer/Makefile
index 9339fc4..b2dd0b5 100644
--- a/programs/create_racer/Makefile
+++ b/programs/create_racer/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = create_racer
+
 lvb_torture: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/extend_and_write/Makefile b/programs/extend_and_write/Makefile
index d60de1a..d56635d 100644
--- a/programs/extend_and_write/Makefile
+++ b/programs/extend_and_write/Makefile
@@ -15,10 +15,11 @@ SOURCES = $(EXTEND_AND_WRITE_SOURCES) $(VERIFY_SOURCES)
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = extend_and_write verify
+
 extend_and_write: $(EXTEND_AND_WRITE_OBJECTS)
 	$(LINK) 
 verify: $(VERIFY_OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/extend_files/Makefile b/programs/extend_files/Makefile
index db3677d..7069504 100644
--- a/programs/extend_files/Makefile
+++ b/programs/extend_files/Makefile
@@ -2,6 +2,20 @@ TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
 
-DIST_FILES = extend_files.sh
+TESTS = truncate_direct
+
+CLEAN_FILES = $(TESTS)
+
+CFLAGS = -O2 -Wall -g
+
+SOURCES = truncate_direct.c
+OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
+
+DIST_FILES = $(SOURCES)
+
+BIN_PROGRAMS = $(TESTS)
+
+truncate_direct: $(OBJECTS)
+	$(LINK) 
 
 include $(TOPDIR)/Postamble.make
diff --git a/programs/extendo/Makefile b/programs/extendo/Makefile
index 0bfb05d..1647381 100644
--- a/programs/extendo/Makefile
+++ b/programs/extendo/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = extendo
+
 extendo: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/fill_verify_holes/Makefile b/programs/fill_verify_holes/Makefile
index be8bac6..202757b 100644
--- a/programs/fill_verify_holes/Makefile
+++ b/programs/fill_verify_holes/Makefile
@@ -16,5 +16,4 @@ fill_holes: fill_holes.o fill_holes.h
 verify_holes: verify_holes.o fill_holes.h
 	$(LINK) $(OCFS2_LIBS)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/lock_grab/Makefile b/programs/lock_grab/Makefile
index a1ca7b1..a884a84 100644
--- a/programs/lock_grab/Makefile
+++ b/programs/lock_grab/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = lock_grab
+
 lock_grab: $(OBJECTS)
 	$(LINK) $(O2DLM_LIBS)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/logwriter/Makefile b/programs/logwriter/Makefile
index 50c1b0f..0a4f14b 100644
--- a/programs/logwriter/Makefile
+++ b/programs/logwriter/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = logwriter
+
 logwriter: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/lvb_torture/Makefile b/programs/lvb_torture/Makefile
index 3edbb84..5d469c8 100644
--- a/programs/lvb_torture/Makefile
+++ b/programs/lvb_torture/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = lvb_torture
+
 lvb_torture: $(OBJECTS)
 	$(LINK) $(O2DLM_LIBS)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/mmap_test/Makefile b/programs/mmap_test/Makefile
index d70a27c..c1fc723 100644
--- a/programs/mmap_test/Makefile
+++ b/programs/mmap_test/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = mmap_test
+
 mmap_test: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/multi_node_mmap/Makefile b/programs/multi_node_mmap/Makefile
index 33255d7..b39cb31 100644
--- a/programs/multi_node_mmap/Makefile
+++ b/programs/multi_node_mmap/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = multi_mmap
+
 multi_mmap: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/sendfiletest/Makefile b/programs/sendfiletest/Makefile
index 565ac90..502b78d 100644
--- a/programs/sendfiletest/Makefile
+++ b/programs/sendfiletest/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = sendfiletest
+
 sendfiletest: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/splice/Makefile b/programs/splice/Makefile
index 7a6db47..4cca80c 100644
--- a/programs/splice/Makefile
+++ b/programs/splice/Makefile
@@ -20,5 +20,4 @@ splice_read: $(SPLICE_READ_OBJECTS)
 splice_write: $(SPLICE_WRITE_OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/truncate/Makefile b/programs/truncate/Makefile
index e8b2ecc..07d2957 100644
--- a/programs/truncate/Makefile
+++ b/programs/truncate/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = truncate
+
 truncate: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/ttest/Makefile b/programs/ttest/Makefile
index ae812ad..3b8188a 100644
--- a/programs/ttest/Makefile
+++ b/programs/ttest/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = ttest
+
 ttest: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/write_append_truncate/Makefile b/programs/write_append_truncate/Makefile
index 9a7f7d1..c558c33 100644
--- a/programs/write_append_truncate/Makefile
+++ b/programs/write_append_truncate/Makefile
@@ -13,8 +13,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = write_append_truncate
+
 write_append_truncate: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/write_torture/Makefile b/programs/write_torture/Makefile
index c54d647..adc8a2e 100644
--- a/programs/write_torture/Makefile
+++ b/programs/write_torture/Makefile
@@ -11,8 +11,9 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = write_torture
+
 write_torture: $(OBJECTS)
 	$(LINK) 
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/utilities/mpi-run-parts/Makefile b/utilities/mpi-run-parts/Makefile
index e25d16b..e5f13fd 100644
--- a/utilities/mpi-run-parts/Makefile
+++ b/utilities/mpi-run-parts/Makefile
@@ -13,8 +13,10 @@ OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 
 DIST_FILES = $(SOURCES)
 
+BIN_PROGRAMS = mpi-run-parts
+
+
 mpi-run-parts: $(OBJECTS)
 	$(LINK)
 
-include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make