diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 0b4a9150daadbb7a1c8bdedd0030b349999bde84..5a6f4227052b1b78b7dd24d9369b0791ee4b350e 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -6,17 +6,25 @@ AM_CFLAGS = $(LLCFLAGS)
 
 noinst_DATA =
 noinst_SCRIPTS = leak_finder.pl llecho.sh llmount.sh llmountcleanup.sh test-framework.sh
-noinst_SCRIPTS += runfailure-mds runvmstat runfailure-net
-noinst_SCRIPTS += runfailure-ost runiozone runregression-net.sh runtests
-noinst_SCRIPTS += sanity.sh rundbench
-noinst_SCRIPTS += cfg/local.sh
-
+noinst_SCRIPTS += runvmstat runiozone runtests
+noinst_SCRIPTS += sanity.sh rundbench test-framework.sh
+noinst_SCRIPTS += acceptance-small.sh compile.sh compile.sh conf-sanity.sh
+noinst_SCRIPTS += echo.sh insanity.sh lfscktest.sh llechocleanup.sh
+noinst_SCRIPTS += llog-test.sh lockorder.sh lstiming.sh mount2fs.sh oos2.sh
+noinst_SCRIPTS += oos.sh recovery-cleanup.sh recovery-small.sh replay-dual.sh
+noinst_SCRIPTS += replay-ost-single.sh replay-single.sh routed.sh run-llog.sh
+noinst_SCRIPTS += run-quotacheck.sh run-quotactl.sh run-quotafmt.sh
+noinst_SCRIPTS += sanity-buffalo.sh sanityN.sh sanity-quota.sh tmpfs-sanity.sh
+noinst_SCRIPTS += kbuild lkcdmap rundbench runiozone runslabinfo
+noinst_SCRIPTS += socketclient socketserver
+nobase_noinst_SCRIPTS = cfg/insanity-local.sh cfg/insanity-ltest.sh
+nobase_noinst_SCRIPTS += cfg/local.sh acl/make-tree acl/run
+nobase_noinst_DATA = acl/cp.test acl/getfacl-noacl.test acl/inheritance.test
+nobase_noinst_DATA += acl/misc.test acl/permissions.test acl/setfacl.test
 
 EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA) \
-             sanity.sh rundbench \
-             acl/run acl/make-tree acl/getfacl-noacl.test acl/cp.test \
-             acl/setfacl.test acl/permissions.test acl/misc.test \
-             acl/inheritance.test
+			 $(nobase_noinst_SCRIPTS) $(nobase_noinst_DATA) \
+			 sanity.sh rundbench
 
 if TESTS
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme
@@ -34,6 +42,11 @@ noinst_PROGRAMS += parallel_grouplock write_append_truncate createmany_mpi
 endif
 # noinst_PROGRAMS += ldaptest copy_attr mkdirdeep 
 bin_PROGRAMS = mcreate munlink
+testdir = $(libdir)/lustre/tests
+test_SCRIPTS = $(noinst_SCRIPTS) $(noinst_PROGRAMS)
+nobase_test_SCRIPTS = $(nobase_noinst_SCRIPTS)
+test_DATA = $(noinst_DATA)
+nobase_test_DATA = $(nobase_noinst_DATA)
 endif # TESTS
 
 stat_SOURCES = stat.c stat_fs.h