-(defpackage #:clsql-classic-tests-system (:use #:asdf #:cl))
-(in-package #:clsql-classic-tests-system)
+(defpackage #:clsql-tests-system (:use #:asdf #:cl))
+(in-package #:clsql-tests-system)
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+ (unless (find-package '#:uffi)
+ (asdf:operate 'asdf:load-op 'uffi)))