diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 43ab676..66c09d2 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -197,7 +197,7 @@ TODO: correct this bug!"
              (find-file-noselect ".emacs.d/snippets/c-mode/stupidsnippet")
            (insert "something")
            (save-buffer)
-           (kill-buffer))
+           (kill-buffer (current-buffer)))
          (test-compiled-snippets-mtime)
          ;; delete a snippet file
          ;;
@@ -209,7 +209,7 @@ TODO: correct this bug!"
          (with-current-buffer (find-file-noselect ".emacs.d/snippets/c-mode/anotherstupidsnippet")
            (insert "blablabla")
            (save-buffer)
-           (kill-buffer))
+           (kill-buffer (current-buffer)))
          (test-compiled-snippets-mtime))))))
 
 
diff --git a/yasnippet.el b/yasnippet.el
index bca3381..246bfdf 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1681,7 +1681,7 @@ Optional USE-JIT use jit-loading of snippets."
             (yas/subdirs dir 'files 'relative))))
 
 (defun yas/compile-calculate-md5 (files-and-mtimes)
-  (secure-hash 'md5 (mapconcat #'(lambda (c) (format "%s%f" (car c) (float-time (cdr c)))) files-and-mtimes " ")))
+  (md5  (mapconcat #'(lambda (c) (format "%s%f" (car c) (float-time (cdr c)))) files-and-mtimes " ")))
 
 (defun yas/recompile-directory-maybe (directory mode-sym)
   (flet ((recompile ()