diff --git a/.dir-locals.el b/.dir-locals.el
index 06c26534d8..c7dc86fffe 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 eb8d2fa016..f8c7115999 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 166ec4da1c..d674547557 100644
--- a/tests/base32.scm
+++ b/tests/base32.scm
@@ -95,7 +95,3 @@
 
 
 (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 0df4cd2737..e94f04b239 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -84,9 +84,3 @@
 
 
 (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 7fafaf5dca..880dddd0b6 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -93,7 +93,3 @@
 
 
 (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 314942a352..98c34b416d 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -547,8 +547,3 @@
 
 
 (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 8b0f29e6bc..32ee558518 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -168,7 +168,5 @@
 (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 89582f2408..9d692e9c02 100644
--- a/tests/snix.scm
+++ b/tests/snix.scm
@@ -72,8 +72,3 @@
 
 
 (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 c10c035d5d..1ff6aa05c2 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -81,7 +81,3 @@
 
 
 (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 455bdb208d..87450d74fd 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -119,9 +119,3 @@
 
 
 (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 96496c5f84..bcdd120a74 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -183,7 +183,3 @@
 
 
 (exit (= (test-runner-fail-count (test-runner-current)) 0))
-
-;;; Local Variables:
-;;; eval: (put 'test-assert 'scheme-indent-function 1)
-;;; End: