diff --git a/fare-utils.asd b/fare-utils.asd
index d59607f4da821017a1465835c6707891d2d5f76c..a7b853076b6b805c15aff0593cda3d31ea83ea66 100644
--- a/fare-utils.asd
+++ b/fare-utils.asd
@@ -1,12 +1,14 @@
 ;;; -*- Mode: Lisp ; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-(defsystem :fare-utils
+(defsystem "fare-utils"
+  :version "1.0.0.1"
   :description "Basic functions and macros, interfaces, pure and stateful datastructures"
   :long-description "fare-utilities is a small collection of utilities.
 It contains a lot of basic everyday functions and macros,
 but also a library of pure and stateful datastructures,
 and Lisp extensions for memoization and reader interception."
-  :depends-on (#-asdf3 :asdf-driver)
-  :version "1.0.0"
+  :license "MIT" ;; also BSD or bugroff
+  :author "Francois-Rene Rideau"
+  :depends-on ((:version "asdf" "3.0"))
   :components
   ((:file "package")
 
@@ -45,8 +47,5 @@ and Lisp extensions for memoization and reader interception."
      (:file "binomial-heap" :depends-on ("container"))
      |#
      (:file "dllist" :depends-on ("container"))
-     #|(:file "sorting" :depends-on ("binary-heap" "binomial-heap"))|#))))
-
-(defmethod perform ((op test-op) (system (eql (find-system :fare-utils))))
-  (asdf:load-system :fare-utils-test)
-  (funcall (read-from-string "fare-utils-test:test-suite")))
+     #|(:file "sorting" :depends-on ("binary-heap" "binomial-heap"))|#)))
+  :in-order-to ((test-op (test-op "fare-utils-test"))))
diff --git a/test/fare-utils-test.asd b/test/fare-utils-test.asd
index 6149ce25a33e95015e348d08f73c6de14bde4c69..18fb5f7faf14add3800d5f99106786506059114a 100644
--- a/test/fare-utils-test.asd
+++ b/test/fare-utils-test.asd
@@ -1,7 +1,12 @@
 ;;; -*- Mode: Lisp ; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
 
-(asdf:defsystem :fare-utils-test
-  :depends-on (:fare-utils :hu.dwim.stefil)
+(defsystem "fare-utils-test"
+  :version "1.0.0.1"
+  :description "Tests for fare-utils"
+  :license "MIT" ;; also BSD or bugroff
+  :author "Francois-Rene Rideau"
+  :depends-on ("fare-utils" "hu.dwim.stefil")
   :components
   ((:file "package")
-   (:file "strings" :depends-on ("package"))))
+   (:file "strings" :depends-on ("package")))
+  :perform (test-op (o c) (symbol-call :fare-utils-test :test-suite)))
diff --git a/test/package.lisp b/test/package.lisp
index 8171279f8f210ea1656d27796c48a4432133a0c0..2ab596e09fe88ff3ec310b7a0f7631096247800d 100644
--- a/test/package.lisp
+++ b/test/package.lisp
@@ -1,9 +1,6 @@
 #+xcvb (module ())
 (defpackage :fare-utils-test
-  (:use :fare-utils
-        :interface :eq :order :pure
-        :reader-interception
-        :cl :hu.dwim.stefil)
+  (:use :cl :fare-utils :uiop :hu.dwim.stefil)
   (:export #:test-suite))
 
 (in-package :fare-utils-test)
diff --git a/test/strings.lisp b/test/strings.lisp
index a4d69d62989f573bb394138778ae6f138c028a35..455fa0abb0ed65c4f78452a60660696d538d1ad6 100644
--- a/test/strings.lisp
+++ b/test/strings.lisp
@@ -6,7 +6,7 @@
             :documentation "Test string functions"))
 
 (deftest test-strcat ()
-  (is (equal (asdf:strcat "foo" "bar" "baz") "foobarbaz")))
+  (is (equal (strcat "foo" "bar" "baz") "foobarbaz")))
 
 (deftest test-join-strings ()
   (is (equal (join-strings '("/bin" "/usr/bin" "/usr/local/bin") :separator ":")