diff --git a/base64.asd b/base64.asd
index ce2ad445448b4fb9280a304dfacd892c4e58d9ce..146e5129a88385b03378a76919915c41ba798f5c 100644
--- a/base64.asd
+++ b/base64.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base64.asd,v 1.21 2003/06/12 14:05:11 kevin Exp $
+;;;; $Id: base64.asd,v 1.22 2003/08/24 20:38:08 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:cl-user)
@@ -30,10 +30,19 @@
   ((:file "package")
    (:file "encode" :depends-on ("package"))
    (:file "decode" :depends-on ("package"))
-   (:file "base64-tests" :depends-on ("encode" "decode"))
    ))
 
 (defmethod perform ((o test-op) (c (eql (find-system 'base64))))
+  (operate 'load-op 'base64-tests)
+  (operate 'test-op 'base64-tests :force t))
+
+(defsystem base64-tests
+    :depends-on (base64)
+    :components
+    ((:file "tests")))
+
+(defmethod perform ((o test-op) (c (eql (find-system 'base64-tests))))
+  (operate 'load-op 'base64-tests)
   (or (funcall (intern (symbol-name '#:test-base64)
 		       (find-package 'base64-test)))
       (error "test-op failed")))
diff --git a/debian/changelog b/debian/changelog
index 64c40a80ba090905704f01c474ceebc9509c68be..6f159e12ec9784dc2820d6cf72e3db939b6b7cfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-base64 (3.3-1) unstable; urgency=low
+
+  * Rework test loading
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 24 Aug 2003 13:40:03 -0600
+
 cl-base64 (3.2.1-1) unstable; urgency=low
 
   * New upstream
diff --git a/base64-tests.lisp b/tests.lisp
similarity index 97%
rename from base64-tests.lisp
rename to tests.lisp
index d1589aacfafa6e3fb534d2cf451f7f90b5976872..dbe0741720db6c952f1f3fbe756e41f5e26bba83 100644
--- a/base64-tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Jan 2003
 ;;;;
-;;;; $Id: base64-tests.lisp,v 1.14 2003/06/12 14:05:11 kevin Exp $
+;;;; $Id: tests.lisp,v 1.1 2003/08/24 20:38:08 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:cl-user)