diff --git a/Rakefile b/Rakefile
index 1bf0045..c68929c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,6 +9,11 @@ end
 find_version
 FileUtils.mkdir_p('pkg')
 
+desc "run tests in batch mode"
+task :tests do
+  $EMACS=ENV["EMACS"] || "emacs"
+  sh "#{$EMACS} -Q -L . -l yasnippet-tests.el -nw --batch -e yas/ert"
+end
 
 desc "convert some textmate bundles to yasnippets"
 task :convert_bundles do
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 62653b0..c3ed30e 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -455,6 +455,15 @@ TODO: be meaner"
 
 ;;; Helpers
 ;;;
+(defun yas/ert ()
+  (interactive)
+  (with-temp-buffer
+    (flet ((message (&rest args)
+                    (declare (ignore args))
+                    nil))
+      (ert t (buffer-name (current-buffer)))
+      (princ (buffer-string)))))
+
 
 (defun yas-should-expand (keys-and-expansions)
   (dolist (key-and-expansion keys-and-expansions)