diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 8896c2547c8..6fa92164f43 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -681,10 +681,15 @@ indentation."
 (put 'define-values 'scheme-indent-function 1)
 (put 'define-record-type 'scheme-indent-function 1) ;; is 1 correct?
 (put 'define-library 'scheme-indent-function 1)
+(put 'guard 'scheme-indent-function 1)
 
 ;; SRFI-8
 (put 'receive 'scheme-indent-function 2)
 
+;; SRFI 64
+(put 'test-group 'scheme-indent-function 1)
+(put 'test-group-with-cleanup 'scheme-indent-function 1)
+
 ;; SRFI-204 (withdrawn, but provided in many implementations, see the SRFI text)
 (put 'match 'scheme-indent-function 1)
 (put 'match-lambda 'scheme-indent-function 0)