diff --git a/Makefile b/Makefile
index d1459a97a3b..f2dd759c093 100644
--- a/Makefile
+++ b/Makefile
@@ -35,3 +35,6 @@ check ::
 	cd test; $(MAKE) 
 
 tools-only: all
+
+check-dejagnu:
+	cd test; $(MAKE) check-dejagnu
\ No newline at end of file
diff --git a/test/Makefile b/test/Makefile
index 466886ea994..be621518f2a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -110,3 +110,31 @@ qmtest-clean:
 	$(RM) -f $(LLVM_SRC_ROOT)/test/results.qmr \
 		$(LLVM_OBJ_ROOT)/test/results.qmr
 
+EXPECT = expect
+RUNTEST = runtest
+
+check-dejagnu: site.exp
+	$(RUNTEST)
+
+dejagnu-clean:
+	cd $(LLVM_OBJ_ROOT)/test/
+	$(RM) -rf Regression/*/Output
+	$(RM) -rf Regression/*/*/Output
+
+site.exp: Makefile $(LLVM_OBJ_ROOT)/Makefile.config
+	@echo 'Making a new site.exp file...'
+	@echo '## these variables are automatically generated by make ##' >site.tmp
+	@echo '# Do not edit here.  If you wish to override these values' >>site.tmp
+	@echo '# edit the last section' >>site.tmp
+	@echo "set target_triplet i686-pc-linux-gnu" >> site.tmp
+	@echo 'set prcontext $(LLVM_SRC_ROOT)/test/Scripts/prcontext.py' >> site.tmp
+	@echo 'set srcdir $(LLVM_SRC_ROOT)/test' >>site.tmp
+	@echo "set objdir $(LLVM_OBJ_ROOT)/test" >>site.tmp
+	@echo 'set llvmgcc $(LLVMGCCDIR)/bin/gcc' >> site.tmp
+	@echo 'set llvmgxx $(LLVMGCCDIR)/bin/g++' >> site.tmp
+	@echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp
+	@test ! -f site.exp || \
+	sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
+	@-rm -f site.bak
+	@test ! -f site.exp || mv site.exp site.bak
+	@mv site.tmp site.exp