diff --git a/build/lustre-kernel-2.4.spec.in b/build/lustre-kernel-2.4.spec.in
index c610623689c23dc4cb2ffd62003469fa1dd310b8..208bc77202dad52f6644d48a37676c0a8ed995e4 100644
--- a/build/lustre-kernel-2.4.spec.in
+++ b/build/lustre-kernel-2.4.spec.in
@@ -530,7 +530,7 @@ BuildKernel()
 	--kerneldir $RPM_SOURCE_DIR \
 	-j $RPM_BUILD_NCPUS \
 	--destdir $RPM_BUILD_ROOT \
-	-- --disable-tests \
+	-- --enable-tests \
 	@CONFIGURE_FLAGS@
 }
 
diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 4a9ef8eb02848e2324e86c7a1378052bb626f2d6..9d49616ad163ea11b958308e03f34a27f5628398 100644
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -68,6 +68,16 @@ Conflicts: lustre-deps-sles
 This package has RPM dependencies appropriate for RHEL, RHL, and FC
 systems.
 
+%package tests
+Summary: Lustre testing framework
+Group: Development/Kernel
+Provides: lustre-tests = %{version}
+Requires: lustre = %{version}
+
+%description tests
+This package contains a set of test binaries and scripts that are intended
+to be used by the Lustre testing framework.
+
 %prep
 %setup -qn lustre-%{version}
 
@@ -158,6 +168,9 @@ fi
 # %files deps-sles
 # %files deps-rhel
 
+%files tests
+%attr(-, root, root) %{_libdir}/lustre/tests/*
+
 %post modules
 if [ -f /boot/System.map-%{kversion} ]; then
 	depmod -ae -F /boot/System.map-%{kversion} %{kversion} || exit 0