diff --git a/.dir-locals.el b/.dir-locals.el
index 06c26534d8d8e9b86c3ca5fef6543b87966c6825..c7dc86fffe2209dc589836602f578deed4c0268d 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -6,6 +6,10 @@
  (scheme-mode
   .
   ((indent-tabs-mode . nil)
+   (eval . (put 'test-assert 'scheme-indent-function 1))
+   (eval . (put 'test-equal 'scheme-indent-function 1))
+   (eval . (put 'call-with-input-string 'scheme-indent-function 1))
+   (eval . (put 'guard 'scheme-indent-function 1))
    (eval . (put 'lambda* 'scheme-indent-function 1))
    (eval . (put 'substitute* 'scheme-indent-function 1))
    (eval . (put 'with-directory-excursion 'scheme-indent-function 1))
diff --git a/guix-build.in b/guix-build.in
index eb8d2fa01667008b161a6b46097cae3cde362107..f8c7115999294da9ad7000c7291f295a1a08d79b 100644
--- a/guix-build.in
+++ b/guix-build.in
@@ -301,7 +301,3 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
                                              (derivation-path->output-paths drv)))
                                       drv)
                                  roots)))))))))
-
-;; Local Variables:
-;; eval: (put 'guard 'scheme-indent-function 1)
-;; End:
diff --git a/tests/base32.scm b/tests/base32.scm
index 166ec4da1c02e6a3d7f15ada0146ca89d7213576..d6745475579b1fdbea0fb05c354b15da634ac1bd 100644
--- a/tests/base32.scm
+++ b/tests/base32.scm
@@ -95,7 +95,3 @@ (define %have-nix-hash?
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index 0df4cd27370de800bbfc7766252d512e22fb018e..e94f04b239894310594275d8f0786e583919d869 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -84,9 +84,3 @@ (define-module (test-build-utils)
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; eval: (put 'test-equal 'scheme-indent-function 1)
-;;; eval: (put 'call-with-input-string 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/builders.scm b/tests/builders.scm
index 7fafaf5dcacd6a1f1b3c21de1de24ed8c1375b8e..880dddd0b6f49b9568469c43302266d87a3c990e 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -93,7 +93,3 @@ (define network-reachable?
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/derivations.scm b/tests/derivations.scm
index 314942a3521c1a4ea4bbffc0245101d4522962d0..98c34b416df5b7ede31ee70afeb0a2043f64c589 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -547,8 +547,3 @@ (define %coreutils
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; eval: (put 'guard 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/packages.scm b/tests/packages.scm
index 8b0f29e6bc2a7694aa4c1a7537ef551368679cdf..32ee55851801d44683809d0070e1174bcbc7dc7b 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -168,7 +168,5 @@ (define-syntax-rule (dummy-package name* extra-fields ...)
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
 
 ;;; Local Variables:
-;;; eval: (put 'test-equal 'scheme-indent-function 2)
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
 ;;; eval: (put 'dummy-package 'scheme-indent-function 1)
 ;;; End:
diff --git a/tests/snix.scm b/tests/snix.scm
index 89582f2408e4a864141dca710a85b79f29d9695b..9d692e9c02d8d9520547ea4644d1eade7703f60c 100644
--- a/tests/snix.scm
+++ b/tests/snix.scm
@@ -72,8 +72,3 @@ (define-syntax-rule (every? proc lists ...)
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; eval: (put 'guard 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/store.scm b/tests/store.scm
index c10c035d5de7f825e2910f656438a56afafa60cc..1ff6aa05c2a8af5bd4f44145c1f8898a91502ebd 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -81,7 +81,3 @@ (define (random-text)
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/union.scm b/tests/union.scm
index 455bdb208d992bd32f302260152a20ff7450e672..87450d74fd8d7f74dc7c45dd4f5e3553b44169f2 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -119,9 +119,3 @@ (define %store
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; eval: (put 'test-equal 'scheme-indent-function 1)
-;;; eval: (put 'call-with-input-string 'scheme-indent-function 1)
-;;; End:
diff --git a/tests/utils.scm b/tests/utils.scm
index 96496c5f846b4e78c638d4ae5ae64055e218ba6a..bcdd120a74ceaf6ee62491ff16f99b3d36b28265 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -183,7 +183,3 @@ (define-record-type* <foo> foo make-foo
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; End: