diff --git a/tests/dejagnu-smoketest/Makefile b/tests/dejagnu-smoketest/Makefile
new file mode 100644
index 0000000..837c343
--- /dev/null
+++ b/tests/dejagnu-smoketest/Makefile
@@ -0,0 +1,38 @@
+TOPLEVEL_NAMESPACE=fedora
+PACKAGE_NAME=systemtap
+RELATIVE_PATH=Sanity/dejagnu-smoketest
+export TESTVERSION=1.0
+export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
+
+.PHONY: all install download clean
+BUILT_FILES= 
+FILES=$(METADATA) runtest.sh Makefile PURPOSE test-smoke.sh
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x ./runtest.sh ./test-smoke.sh
+
+clean:
+	rm -f *~ *.rpm $(BUILT_FILES)
+
+include /usr/share/rhts/lib/rhts-make.include
+
+# Generate the testinfo.desc here:
+$(METADATA): Makefile
+	@touch $(METADATA)
+# Change to the test owner's name
+	@echo "Owner:        Frank Ch. Eigler <fche@redhat.com>" > $(METADATA)
+	@echo "Name:         $(TEST)" >> $(METADATA)
+	@echo "Path:         $(TEST_DIR)" >> $(METADATA)
+	@echo "TestVersion:  $(TESTVERSION)" >> $(METADATA)
+	@echo "Type:         Sanity" >> $(METADATA)
+	@echo "Description:  smoke test" >> $(METADATA)
+	@echo "TestTime:     10m" >> $(METADATA)
+	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
+	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
+	@echo "License:      GPLv2" >> $(METADATA)
+
+# You may need other fields here; see the documentation
+	rhts-lint $(METADATA)
diff --git a/tests/dejagnu-smoketest/runtest.sh b/tests/dejagnu-smoketest/runtest.sh
index 1ca3c89..879aaf0 100755
--- a/tests/dejagnu-smoketest/runtest.sh
+++ b/tests/dejagnu-smoketest/runtest.sh
@@ -1,11 +1,3 @@
-#! /bin/sh
+#!/bin/sh
 
-set -e
-cd /usr/share/systemtap/testsuite
-make installcheck RUNTESTFLAGS=proc_by_pid.exp
-cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results
-if grep -q unexpected systemtap.sum.results ; then
-   exit 0
-else
-   exit 1
-fi
+rhts-run-simple-test $TEST ./test-smoke.sh
diff --git a/tests/dejagnu-smoketest/test-smoke.sh b/tests/dejagnu-smoketest/test-smoke.sh
new file mode 100755
index 0000000..4dcdc6d
--- /dev/null
+++ b/tests/dejagnu-smoketest/test-smoke.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+set -e
+set -x
+cd /usr/share/systemtap/testsuite
+make installcheck RUNTESTFLAGS=proc_by_pid.exp
+cat systemtap.sum | sed -ne '/systemtap.Summary/,$ p' | tee systemtap.sum.results
+if grep -q unexpected systemtap.sum.results ; then
+   exit 0
+else
+   exit 1
+fi