diff --git a/Makefile b/Makefile
index a13be8ae0a3..c8604daf74e 100644
--- a/Makefile
+++ b/Makefile
@@ -113,6 +113,9 @@ endif
 check-llvm2cpp:
 	$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
 
+check-one:
+	$(MAKE) -C test check-one TESTONE=$(TESTONE)
+
 srpm: $(LLVM_OBJ_ROOT)/llvm.spec 
 	rpmbuild -bs $(LLVM_OBJ_ROOT)/llvm.spec
 
diff --git a/test/Makefile b/test/Makefile
index 001e3ac62f5..7c8a7b3bd72 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -42,6 +42,25 @@ check-local:: site.exp
 	@echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."
 endif
 
+ifdef TESTONE
+CLEANED_TESTONE := $(patsubst %/,%,$(TESTONE))
+CLEANED_TESTONE := $(patsubst test/%,%,$(CLEANED_TESTONE))
+SUBDIR := $(shell dirname $(CLEANED_TESTONE))
+TESTPATH := $(LLVM_SRC_ROOT)/test/$(CLEANED_TESTONE)
+check-one: site.exp $(TCLSH)
+	@( echo "source $(LLVM_SRC_ROOT)/test/site.exp" ; \
+	  echo "set subdir $(SUBDIR)" ; \
+	  echo "proc pass  { msg } { puts \"PASS: \$$msg\" } "; \
+	  echo "proc fail  { msg } { puts \"FAIL: \$$msg\" }" ; \
+	  echo "proc xfail { msg } { puts \"XFAIL: \$$msg\" }" ; \
+	  echo "proc xpass { msg } { puts \"XPASS: \$$msg\" }" ; \
+	  echo "source $(LLVM_SRC_ROOT)/test/lib/llvm.exp" ; \
+	  echo "RunLLVMTests $(TESTPATH)" ) | \
+	( ulimit -t 600 ; ulimit -d 512000 ; \
+	  PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
+	  $(TCLSH) )
+endif
+
 clean::
 	$(RM) -rf `find $(LLVM_OBJ_ROOT)/test -name Output -type d -print`