diff --git a/iolib.asd b/iolib.asd
index 3dce9b2a..63cc7ce5 100644
--- a/iolib.asd
+++ b/iolib.asd
@@ -248,4 +248,26 @@
   :encoding :utf-8
   :pathname "src/iolib/"
   :components ((:file "pkgdcl"))
-  :in-order-to ((test-op (test-op :iolib.tests))))
+  :in-order-to ((test-op (test-op :iolib/tests))))
+
+(defsystem :iolib/tests
+  :description "IOLib test suite."
+  :author "Luis Oliveira <loliveira@common-lisp.net>"
+  :maintainer "Stelian Ionescu <sionescu@cddr.org>"
+  :licence "MIT"
+  :version (:read-file-form "version.sexp")
+  :defsystem-depends-on (:iolib.base)
+  :depends-on (:fiveam :iolib :iolib/pathnames)
+  :around-compile "iolib/asdf:compile-wrapper"
+  :encoding :utf-8
+  :pathname "tests/"
+  :components
+  ((:file "pkgdcl")
+   (:file "defsuites" :depends-on ("pkgdcl"))
+   (:file "base" :depends-on ("pkgdcl" "defsuites"))
+   (:file "file-paths-os" :depends-on ("pkgdcl" "defsuites")
+    :pathname #+unix "file-paths-unix")
+   (:file "events" :depends-on ("pkgdcl" "defsuites"))
+   (:file "streams" :depends-on ("pkgdcl" "defsuites"))
+   (:file "sockets" :depends-on ("pkgdcl" "defsuites")))
+  :perform (test-op (o c) (symbol-call :5am :run! :iolib)))
diff --git a/iolib.tests.asd b/iolib.tests.asd
deleted file mode 100644
index c31d6bc6..00000000
--- a/iolib.tests.asd
+++ /dev/null
@@ -1,23 +0,0 @@
-;;;; -*- Mode: Lisp; indent-tabs-mode: nil -*-
-
-(defsystem :iolib.tests
-  :description "IOLib test suite."
-  :author "Luis Oliveira <loliveira@common-lisp.net>"
-  :maintainer "Stelian Ionescu <sionescu@cddr.org>"
-  :licence "MIT"
-  :version (:read-file-form "version.sexp")
-  :defsystem-depends-on (:iolib.base)
-  :depends-on (:fiveam :iolib :iolib/pathnames)
-  :around-compile "iolib/asdf:compile-wrapper"
-  :encoding :utf-8
-  :pathname "tests/"
-  :components
-  ((:file "pkgdcl")
-   (:file "defsuites" :depends-on ("pkgdcl"))
-   (:file "base" :depends-on ("pkgdcl" "defsuites"))
-   (:file "file-paths-os" :depends-on ("pkgdcl" "defsuites")
-     :pathname #+unix "file-paths-unix")
-   (:file "events" :depends-on ("pkgdcl" "defsuites"))
-   (:file "streams" :depends-on ("pkgdcl" "defsuites"))
-   (:file "sockets" :depends-on ("pkgdcl" "defsuites")))
-  :perform (test-op (o c) (symbol-call :5am :run! :iolib)))