         (buffer-string))))
 
   (desc "org-redmine-get-issue : Can't find issue id")
-  (expect "OrgRedmine - Not retrieved: Can't find issue #1 on http://localhost
-"
+  (expect "OrgRedmine - Not retrieved: Can't find issue #1 on http://localhost"
     (stub call-process => 22)
     (let ((org-redmine-uri "http://localhost"))
-      (save-excursion
-        (set-buffer (get-buffer-create "*Messages*"))
-        (erase-buffer)
-        (org-redmine-get-issue "1")
-        (buffer-string))))
+      (org-redmine-get-issue "1")
+      (current-message)))
 
   (desc "org-redmine-issue-uri")
   (expect "http://localhost/issues/1"


;; setup
(require 'org-redmine-test-fixture)

(defun change-buffer-to (mode)
  (if (version< "23.2" emacs-version)

        (org-redmine-insert-header fixture-issue 1)
        (buffer-string))))

  ;; (desc "org-redmine-insert-header escaped %")
  ;; (expect "* [%p_n%] #%i% by %Wataru MIYAGUNI"
  ;;   (with-current-buffer (exps-tmpbuf)
  ;;     (let ((org-redmine-template-header "[%%p_n%%] #%%i%% by %%%as_n%"))
  ;;       (change-buffer-to 'org-mode)
  ;;       (org-redmine-insert-header fixture-issue 1)
  ;;       (buffer-string))))

  (desc "org-redmine-insert-property")
  (expect "\
* hoge
