diff --git a/tests/media-server-test.rkt b/tests/media-server-test.rkt
index e028b52..903136c 100644
--- a/tests/media-server-test.rkt
+++ b/tests/media-server-test.rkt
@@ -4,8 +4,8 @@
          racket/port
          racket/tcp
          xml
-         upnp/media-server
-         upnp/private/model)
+         "../media-server.rkt"
+         "..//private/model.rkt")
 
 (define listener (tcp-listen 0 4 #t "127.0.0.1"))
 (define-values (_local-host port _remote-host _remote-port)
diff --git a/tests/upnp-test.rkt b/tests/upnp-test.rkt
index 5059596..f12bd01 100644
--- a/tests/upnp-test.rkt
+++ b/tests/upnp-test.rkt
@@ -4,13 +4,7 @@
          racket/port
          racket/string
          racket/tcp
-         upnp
-         upnp/media-renderer
-         upnp/services/av-transport
-         upnp/services/connection-manager
-         upnp/services/content-directory
-         upnp/services/rendering-control
-         upnp/private/model)
+	 "../main.rkt")
 
 (define av1
   (upnp-service "urn:schemas-upnp-org:service:AVTransport:1"