diff --git a/recipes-ti/beagleboard/beaglebone-tester.bb b/recipes-ti/beagleboard/beaglebone-tester.bb
new file mode 100644
index 00000000..504096d4
--- /dev/null
+++ b/recipes-ti/beagleboard/beaglebone-tester.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "BeagleBone tester scripts"
+HOMEPAGE = "http://beagleboard.org/support"
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM="file://gpl.txt;md5=5b122a36d0f6dc55279a0ebc69f3c60b"
+
+# only scripts and data
+inherit allarch
+
+SRC_URI = "git://github.com/joelagnel/validation-scripts.git;protocol=git \
+           file://0001-Initscript-check-for-run_hardware_tests-in-systemd-u.patch \
+          "
+SRCREV = "1b0b8d45cf0718a1768503e8f7616aff6fc3ca03"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/bone-tester/component/data/
+	install -d ${D}${localstatedir}/lib/bone-tester/init-scripts/
+	install -d ${D}${localstatedir}/lib/bone-tester/lib
+	install -d ${D}${base_libdir}/systemd/system/multi-user.target.wants/
+	install -d ${D}/boot/
+	install -m 0755 ${S}/bone-tester/init-scripts/uEnv.txt ${D}/boot/uEnv.txt
+
+	# systemd configuration
+	ln -s ../bone-tester.service ${D}${base_libdir}/systemd/system/multi-user.target.wants/bone-tester.service
+	install -m 0755 ${S}/bone-tester/init-scripts/bone-tester.service ${D}${base_libdir}/systemd/system/bone-tester.service
+	install -m 0755 ${S}/bone-tester/init-scripts/init.sh ${D}${localstatedir}/lib/bone-tester/init-scripts/init.sh
+
+	for i in $(find ${S}/bone-tester/component/ -maxdepth 1 -type f) ; do
+		install -m 0755 ${i} ${D}${localstatedir}/lib/bone-tester/component/
+	done
+	for i in ${S}/bone-tester/component/data/* ; do
+		install -m 0755 ${i} ${D}${localstatedir}/lib/bone-tester/component/data/
+	done
+	for i in ${S}/bone-tester/lib/* ; do
+		install -m 0755 ${i} ${D}${localstatedir}/lib/bone-tester/lib/
+	done
+}
+
+
+FILES_${PN} += "${base_libdir}/systemd \
+                /boot \
+               "
+
+RDEPENDS_${PN} = "iputils"
+RRECOMMENDS_${PN} = "kernel-module-g-zero \
+                     kernel-module-g-file-storage \
+                     kernel-module-smsc95xx"
+
diff --git a/recipes-ti/beagleboard/beaglebone-tester/0001-Initscript-check-for-run_hardware_tests-in-systemd-u.patch b/recipes-ti/beagleboard/beaglebone-tester/0001-Initscript-check-for-run_hardware_tests-in-systemd-u.patch
new file mode 100644
index 00000000..c8df0e37
--- /dev/null
+++ b/recipes-ti/beagleboard/beaglebone-tester/0001-Initscript-check-for-run_hardware_tests-in-systemd-u.patch
@@ -0,0 +1,26 @@
+From 1a2bacad336c8d36c8b94c802510fe7eb23e7830 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Thu, 13 Oct 2011 12:54:47 +0300
+Subject: [PATCH] Initscript: check for 'run_hardware_tests' in systemd unit file
+
+Signed-off-by: Koen Kooi <k-kooi@ti.com>
+---
+ bone-tester/init-scripts/bone-tester.service |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/bone-tester/init-scripts/bone-tester.service b/bone-tester/init-scripts/bone-tester.service
+index 78f8fa8..bf2b2d2 100644
+--- a/bone-tester/init-scripts/bone-tester.service
++++ b/bone-tester/init-scripts/bone-tester.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=BeagleBone Tester
+-ConditionPathExists=|/var/lib/bone-tester
++ConditionPathExists=/var/lib/bone-tester
++ConditionKernelCommandLine=run_hardware_tests
+ 
+ [Service]
+ StandardOutput=syslog
+-- 
+1.6.6.1
+