diff --git a/appveyor.yml b/appveyor.yml
index 571ae4a8..b0122f3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,9 +5,9 @@ environment:
   CYG_ROOT: "C:\\cygwin"
   CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
   TESTS: "false"
-  PINS: "conduit.0.15.0:. mirage-conduit:."
+  PINS: "conduit.dev:. conduit-lwt.dev:. mirage-conduit.dev:."
   EXTRA_REMOTES: "https://github.com/mirage/mirage-dev.git"
-  PACKAGE: "mirage-conduit"
+  PACKAGE: "mirage-conduit.dev"
 
 install:
   - appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
diff --git a/mirage-conduit.opam b/mirage-conduit.opam
index 512460d1..e7ac33f8 100644
--- a/mirage-conduit.opam
+++ b/mirage-conduit.opam
@@ -11,13 +11,14 @@ build: [
   ["jbuilder" "subst" "-p" name "--name" name] {pinned}
   ["jbuilder" "build" "-p" name "-j" jobs]
 ]
+build-test: ["jbuilder" "runtest" "-p" name]
 
 depends: [
   "cstruct"          {>= "3.0.0"}
   "mirage-types-lwt" {>= "3.0.0"}
   "mirage-flow-lwt"  {>= "1.2.0"}
   "mirage-dns"       {>= "3.0.0"}
-  "conduit-lwt" 
+  "conduit-lwt"
   "vchan"            {>= "3.0.0"}
   "tls"              {>="0.8.0"}
 ]
diff --git a/mirage/jbuild b/mirage/jbuild
index c7bfd38d..8b6dc418 100644
--- a/mirage/jbuild
+++ b/mirage/jbuild
@@ -5,4 +5,5 @@
   (preprocess (pps (ppx_sexp_conv)))
   (modules (conduit_mirage resolver_mirage conduit_xenstore))
   (wrapped false)
-  (libraries (conduit conduit-lwt mirage-types-lwt mirage-dns vchan tls tls.lwt))))
+  (libraries (conduit conduit-lwt mirage-types-lwt mirage-dns vchan
+              tls tls.mirage))))
diff --git a/tests/mirage/simple/jbuild b/tests/mirage/simple/jbuild
new file mode 100644
index 00000000..26883afe
--- /dev/null
+++ b/tests/mirage/simple/jbuild
@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+  ((name      test)
+   (libraries (mirage-conduit))))
+
+(alias
+ ((name    runtest)
+  (package mirage-conduit)
+  (deps    (test.exe))
+  (action  (run ${exe:test.exe} --color=always))))
diff --git a/tests/mirage/simple/test.ml b/tests/mirage/simple/test.ml
new file mode 100644
index 00000000..59318876
--- /dev/null
+++ b/tests/mirage/simple/test.ml
@@ -0,0 +1,10 @@
+(* this is just to test that linking works properly *)
+
+let client: Conduit_mirage.client =
+  `TCP (Ipaddr.of_string_exn "127.0.0.1", 12345)
+
+let server: Conduit_mirage.server =
+  `TCP 12345
+
+let _client () = Conduit_mirage.(connect empty) client
+let _server () = Conduit_mirage.(listen empty) server