diff --git a/debian/changelog b/debian/changelog
index 127633d..ff26f35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+flexi-streams (20220110.git74a1027-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 16 May 2022 07:25:34 -0000
+
 flexi-streams (20210728.git41af5dc-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/testsuite-read-only.patch b/debian/patches/testsuite-read-only.patch
index fb9e1b7..1a22dc7 100644
--- a/debian/patches/testsuite-read-only.patch
+++ b/debian/patches/testsuite-read-only.patch
@@ -6,8 +6,10 @@ Forwarded: not-needed
 Last-Update: 2018-03-27
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/test.lisp
-+++ b/test/test.lisp
+Index: flexi-streams/test/test.lisp
+===================================================================
+--- flexi-streams.orig/test/test.lisp
++++ flexi-streams/test/test.lisp
 @@ -260,7 +260,7 @@ about each individual comparison if VERB
                                     (merge-pathnames path-out *tmp-dir*)))
                     (full-path-orig (merge-pathnames path-out *this-file*)))
diff --git a/flexi-streams-test.asd b/flexi-streams-test.asd
new file mode 100644
index 0000000..6f820f5
--- /dev/null
+++ b/flexi-streams-test.asd
@@ -0,0 +1,41 @@
+;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*-
+
+;;; Copyright (c) 2005-2008, Dr. Edmund Weitz.  All rights reserved.
+
+;;; Redistribution and use in source and binary forms, with or without
+;;; modification, are permitted provided that the following conditions
+;;; are met:
+
+;;;   * Redistributions of source code must retain the above copyright
+;;;     notice, this list of conditions and the following disclaimer.
+
+;;;   * Redistributions in binary form must reproduce the above
+;;;     copyright notice, this list of conditions and the following
+;;;     disclaimer in the documentation and/or other materials
+;;;     provided with the distribution.
+
+;;; THIS SOFTWARE IS PROVIDED BY THE AUTHOR 'AS IS' AND ANY EXPRESSED
+;;; OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+;;; WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+;;; ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+;;; DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+;;; DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+;;; GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+;;; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+;;; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+;;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+;;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+(in-package :cl-user)
+
+(defpackage :flexi-streams-system
+  (:use :asdf :cl))
+
+(in-package :flexi-streams-system)
+
+(defsystem :flexi-streams-test
+  :components ((:module "test"
+                        :serial t
+                        :components ((:file "packages")
+                                     (:file "test"))))
+  :depends-on (:flexi-streams))
diff --git a/flexi-streams.asd b/flexi-streams.asd
index 5e8b90f..2455fe0 100644
--- a/flexi-streams.asd
+++ b/flexi-streams.asd
@@ -68,13 +68,6 @@
                (:file "strings"))
   :depends-on (:trivial-gray-streams))
 
-(defsystem :flexi-streams-test
-  :components ((:module "test"
-                        :serial t
-                        :components ((:file "packages")
-                                     (:file "test"))))
-  :depends-on (:flexi-streams))
-
 (defmethod perform ((o test-op) (c (eql (find-system 'flexi-streams))))
   (operate 'load-op 'flexi-streams-test)
   (funcall (intern (symbol-name :run-all-tests)