diff --git a/tools/build.lisp b/tools/build.lisp
index 2ecf9c1873cf22c68eccb67286eecad1fac79b81..3571c4b598c8b4fc55db8b6cd624b4e79b11b8c2 100644
--- a/tools/build.lisp
+++ b/tools/build.lisp
@@ -7,8 +7,7 @@
 
 (deftestcmd build-asdf-tools ()
   "build a binary for asdf-tools"
-  (when (asdf:traverse :program-op :asdf-tools)
-    (asdf:operate :program-op :asdf-tools))
+  (asdf:operate :program-op :asdf-tools)
   (success))
 
 ;;; Documentation
diff --git a/tools/test-environment.lisp b/tools/test-environment.lisp
index 3508ccbab25cb1ad81b610dad7f6e5408e5516bb..a4e48802ab68a565a4b7c0a6a6cc0d73bf0fcd7f 100644
--- a/tools/test-environment.lisp
+++ b/tools/test-environment.lisp
@@ -136,7 +136,7 @@ and which systems to test loading with ASDF_TEST_SYSTEMS or s=
           (upgrade-methods ((upgrade-methods *upgrade-test-methods*))
            (setf upgrade-methods (get-upgrade-methods upgrade-methods)))
           (new-version (new-version)
-           (setf new-version (or new-version (next-version (version-from-file))))))
+           (setf new-version (or new-version (compute-next-version (version-from-file))))))
         :for arg :in args
         :for (found larg init) = (assoc arg argmap)
         :append (if found larg (list arg)) :into largs
diff --git a/tools/version.lisp b/tools/version.lisp
index cf53e7f9fe71def1fd837301d3cbbea6a2ab6bd9..9440b2c36678415569d323b342d908160d30e358 100644
--- a/tools/version.lisp
+++ b/tools/version.lisp
@@ -51,7 +51,7 @@
 (defparameter *old-version* :default)
 (defparameter *new-version* :default)
 
-(defun next-version (v)
+(defun compute-next-version (v)
   (let ((pv (parse-version v 'error)))
     (assert (first pv))
     (assert (second pv))
@@ -70,7 +70,7 @@
       (v1 (check (version-from-file) v1))
       ((not (eq *new-version* :default)) *new-version*) ;; Ugly passing of argument from Makefile.
       (t (let ((old (version-from-file)))
-           (check old (next-version old)))))))
+           (check old (compute-next-version old)))))))
 
 (deftype byte-vector () '(array (unsigned-byte 8) (*)))