diff --git a/libs/http-client.factor b/libs/http-client/http-client.factor
similarity index 96%
rename from libs/http-client.factor
rename to libs/http-client/http-client.factor
index f28cc2c6f2..9e575f2fe4 100644
--- a/libs/http-client.factor
+++ b/libs/http-client/http-client.factor
@@ -1,7 +1,5 @@
 ! Copyright (C) 2005 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-REQUIRES: libs/http ;
-
 IN: http-client
 USING: errors hashtables http kernel math namespaces parser
 sequences io strings ;
@@ -66,6 +64,4 @@ DEFER: http-get
     #! Make a POST request. The content is URL encoded for you.
     parse-url over parse-host <client> [
         post-request flush read-response stdio get contents
-    ] with-stream ;
-
-PROVIDE: libs/http-client ;
\ No newline at end of file
+    ] with-stream ;
\ No newline at end of file
diff --git a/libs/http-client/load.factor b/libs/http-client/load.factor
new file mode 100644
index 0000000000..121c41f5ff
--- /dev/null
+++ b/libs/http-client/load.factor
@@ -0,0 +1,5 @@
+REQUIRES: libs/http ;
+
+PROVIDE: libs/http-client
+{ +files+ { "http-client.factor" } }
+{ +tests+ { "test.factor" } } ;
diff --git a/libs/httpd/test/http-client.factor b/libs/http-client/test.factor
similarity index 100%
rename from libs/httpd/test/http-client.factor
rename to libs/http-client/test.factor
diff --git a/libs/httpd/load.factor b/libs/httpd/load.factor
index 777ff837b2..0764011d4c 100644
--- a/libs/httpd/load.factor
+++ b/libs/httpd/load.factor
@@ -18,7 +18,6 @@ PROVIDE: libs/httpd
 } }
 { +tests+ {
     "test/html.factor"
-    "test/http-client.factor"
     "test/httpd.factor"
     "test/url-encoding.factor"
 } } ;