diff --git a/user.lisp b/user.lisp
index 0cf64247747d9e557c1df8f52c1b8be250bd5c4d..e78731de141f9ba87a0871822a4dde86aff134b8 100644
--- a/user.lisp
+++ b/user.lisp
@@ -3,6 +3,9 @@
 
 (uiop/package:define-package :asdf/user
   (:nicknames :asdf-user)
-  ;; TODO: it would be nice to have :UIOP in the list,
-  ;; but we need test compatibility with cl-test-grid first.
-  (:use :uiop/common-lisp :uiop/package :asdf/interface))
+  ;; NB: releases before 3.1.1 this :use'd only uiop/package instead of uiop below.
+  ;; They also :use'd uiop/common-lisp, that reexports common-lisp and is not included in uiop.
+  ;; ASDF3 releases from 2.27 to 2.31 called uiop asdf-driver and asdf/foo uiop/foo.
+  ;; ASDF1 and ASDF2 releases (2.26 and earlier) create a temporary package
+  ;; that only :use's :cl and :asdf
+  (:use :uiop/common-lisp :uiop :asdf/interface))