diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b399931a42..9469f89bcf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -673,7 +673,7 @@ ease from the desktop to a microcontroller or embedded system.")
        ("bash-minimal" ,bash-minimal)   ; Used as /bin/sh
        ("xz" ,xz)))                     ; liblzma
     (arguments
-     `(#:tests? #f ; Disabled for now, there are simply too many unfixable tests failing
+     `(#:tests? #f     ;FIXME: Disabled for now, there are many tests failing.
        #:modules ((ice-9 ftw) (ice-9 match)
                   (guix build utils) (guix build gnu-build-system))
        #:phases (modify-phases %standard-phases
@@ -782,19 +782,18 @@ ease from the desktop to a microcontroller or embedded system.")
                                        "pypy-dist/lib-python/3/encodings/rot_13.py")
                           (("#!.+/bin/python")
                            (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3")))
-                        (with-fluids
-                         ((%default-port-encoding "ISO-8859-1"))
-                         (substitute*
-                             '("pypy-dist/lib_pypy/_md5.py" "pypy-dist/lib_pypy/_sha1.py")
-                           (("#!.+/bin/python")
-                            (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3"))))
+                        (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                          (substitute* '("pypy-dist/lib_pypy/_md5.py"
+                                         "pypy-dist/lib_pypy/_sha1.py")
+                            (("#!.+/bin/python")
+                             (string-append "#!" (assoc-ref outputs "out") "/bin/pypy3"))))
                         (copy-recursively "pypy-dist" (assoc-ref outputs "out")))
                       #t)))))
     (home-page "https://www.pypy.org/")
     (synopsis "Python implementation with just-in-time compilation")
     (description "PyPy is a faster, alternative implementation of the Python
-programming language employing a just-in-time compiler.  Supports most Python
-code natively, including C extensions.")
+programming language employing a just-in-time compiler.  It supports most
+Python code natively, including C extensions.")
     (license (list license:expat        ; pypy itself; _pytest/
                    license:psfl ; python standard library in lib-python/
                    license:asl2.0 ; dotviewer/font/ and some of lib-python/